diff options
| author | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
| commit | afc53c6f553c97ab778154154aa2b7a146cb5fef (patch) | |
| tree | 66b5ec886a49894feda44ccf8b5233ef39a46536 /js/data | |
| parent | 8974ecd564563a991ff96f9cb6d47da172174242 (diff) | |
| parent | db2fd02a1b0e909bb536fa63cefd2144f4642ead (diff) | |
| download | ninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz | |
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/data')
| -rwxr-xr-x | js/data/tools-data.js | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index de965dbc..00de9236 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
| @@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 28 | "action": "SubselectionTool", | 28 | "action": "SubselectionTool", |
| 29 | "toolTip": "Subselect Tool", | 29 | "toolTip": "Subselect Tool", |
| 30 | "cursor": "auto", | 30 | "cursor": "auto", |
| 31 | "lastInGroup": false, | 31 | "lastInGroup": true, |
| 32 | "container": false, | 32 | "container": false, |
| 33 | "selected": false | 33 | "selected": false |
| 34 | }, | 34 | }, |
| @@ -153,43 +153,43 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 153 | "action": "FillTool", | 153 | "action": "FillTool", |
| 154 | "toolTip": "Fill Tool", | 154 | "toolTip": "Fill Tool", |
| 155 | "cursor": "url('images/tools/bucket_down.png'), default", | 155 | "cursor": "url('images/tools/bucket_down.png'), default", |
| 156 | "lastInGroup": false, | 156 | "lastInGroup": true, |
| 157 | "container": false, | ||
| 158 | "selected": false | ||
| 159 | }, | ||
| 160 | { | ||
| 161 | "id": "InkBottleTool", | ||
| 162 | "properties": "inkbottleProperties", | ||
| 163 | "spriteSheet": true, | ||
| 164 | "action": "InkBottleTool", | ||
| 165 | "toolTip": "Ink Bottle Tool", | ||
| 166 | "cursor": "url('images/tools/inkbottle_down.png'), default", | ||
| 167 | "lastInGroup": false, | ||
| 168 | "container": false, | 157 | "container": false, |
| 169 | "selected": false | 158 | "selected": false |
| 170 | }, | 159 | }, |
| 160 | // { | ||
| 161 | // "id": "InkBottleTool", | ||
| 162 | // "properties": "inkbottleProperties", | ||
| 163 | // "spriteSheet": true, | ||
| 164 | // "action": "InkBottleTool", | ||
| 165 | // "toolTip": "Ink Bottle Tool", | ||
| 166 | // "cursor": "url('images/tools/inkbottle_down.png'), default", | ||
| 167 | // "lastInGroup": false, | ||
| 168 | // "container": false, | ||
| 169 | // "selected": false | ||
| 170 | // }, | ||
| 171 | { | 171 | { |
| 172 | "id": "EyedropperTool", | 172 | "id": "EyedropperTool", |
| 173 | "properties": "eyedropperProperties", | 173 | "properties": "eyedropperProperties", |
| 174 | "spriteSheet": true, | 174 | "spriteSheet": true, |
| 175 | "action": "EyedropperTool", | 175 | "action": "EyedropperTool", |
| 176 | "toolTip": "Eyedropper Tool", | 176 | "toolTip": "Eyedropper Tool", |
| 177 | "cursor": "url('images/tools/eyedropper_down.png'), default", | 177 | "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", |
| 178 | "lastInGroup": false, | ||
| 179 | "container": false, | ||
| 180 | "selected": false | ||
| 181 | }, | ||
| 182 | { | ||
| 183 | "id": "EraserTool", | ||
| 184 | "properties": "eraserProperties", | ||
| 185 | "spriteSheet": true, | ||
| 186 | "action": "EraserTool", | ||
| 187 | "toolTip": "Eraser Tool", | ||
| 188 | "cursor": "auto", | ||
| 189 | "lastInGroup": false, | 178 | "lastInGroup": false, |
| 190 | "container": false, | 179 | "container": false, |
| 191 | "selected": false | 180 | "selected": false |
| 192 | }, | 181 | }, |
| 182 | // { | ||
| 183 | // "id": "EraserTool", | ||
| 184 | // "properties": "eraserProperties", | ||
| 185 | // "spriteSheet": true, | ||
| 186 | // "action": "EraserTool", | ||
| 187 | // "toolTip": "Eraser Tool", | ||
| 188 | // "cursor": "auto", | ||
| 189 | // "lastInGroup": false, | ||
| 190 | // "container": false, | ||
| 191 | // "selected": false | ||
| 192 | // }, | ||
| 193 | { | 193 | { |
| 194 | "id": "RotateStageTool3D", | 194 | "id": "RotateStageTool3D", |
| 195 | "properties": "rotateStageProperties", | 195 | "properties": "rotateStageProperties", |
| @@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 219 | "action": "ZoomTool", | 219 | "action": "ZoomTool", |
| 220 | "toolTip": "Zoom Tool (Z)", | 220 | "toolTip": "Zoom Tool (Z)", |
| 221 | "cursor": "url('images/cursors/zoom.png'),default", | 221 | "cursor": "url('images/cursors/zoom.png'),default", |
| 222 | "lastInGroup": false, | 222 | "lastInGroup": true, |
| 223 | "container": false, | 223 | "container": false, |
| 224 | "selected": false | 224 | "selected": false |
| 225 | } | 225 | } |