aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-22 16:40:03 -0800
committerValerio Virgillito2012-02-22 16:40:03 -0800
commitf8e491fe81981c95fb1352a21d1f99cc375f240e (patch)
tree4b8c49cf9a3317154aeff29c72ac888c187df09a /js/data
parent91f6f672ee96c6e7e942b555af7057d6db52d90f (diff)
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
downloadninja-f8e491fe81981c95fb1352a21d1f99cc375f240e.tar.gz
Merge branch 'refs/heads/master' into file-io
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/tools-data.js50
1 files changed, 25 insertions, 25 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index de965dbc..4847fa7c 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,21 +153,21 @@ 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",
@@ -179,17 +179,17 @@ exports.ToolsData = Montage.create(Montage, {
179 "container": false, 179 "container": false,
180 "selected": false 180 "selected": false
181 }, 181 },
182 { 182// {
183 "id": "EraserTool", 183// "id": "EraserTool",
184 "properties": "eraserProperties", 184// "properties": "eraserProperties",
185 "spriteSheet": true, 185// "spriteSheet": true,
186 "action": "EraserTool", 186// "action": "EraserTool",
187 "toolTip": "Eraser Tool", 187// "toolTip": "Eraser Tool",
188 "cursor": "auto", 188// "cursor": "auto",
189 "lastInGroup": false, 189// "lastInGroup": false,
190 "container": false, 190// "container": false,
191 "selected": false 191// "selected": false
192 }, 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 }