aboutsummaryrefslogtreecommitdiff
path: root/js/data/tools-data.js
diff options
context:
space:
mode:
authorJon Reid2012-06-26 14:58:10 -0700
committerJon Reid2012-06-26 14:58:10 -0700
commit2599f74d72293b809929d8a0b36fb8e721f194cd (patch)
treeca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/data/tools-data.js
parentab9d14780eed98f39786fae4518e69861b34bad7 (diff)
parente4304b9ac6c58802de4dd334be1f5802533f5160 (diff)
downloadninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/data/tools-data.js')
-rwxr-xr-xjs/data/tools-data.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 138f9f4d..8ed6433e 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -46,6 +46,9 @@ exports.ToolsData = Montage.create(Montage, {
46 zoomToolIndex: { 46 zoomToolIndex: {
47 value: 12 47 value: 12
48 }, 48 },
49 bindingToolIndex: {
50 value: 13
51 },
49 52
50 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 53 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above.
51 // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above 54 // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
@@ -243,6 +246,18 @@ exports.ToolsData = Montage.create(Montage, {
243 "container": false, 246 "container": false,
244 "subtools": [], 247 "subtools": [],
245 "selected": false 248 "selected": false
249 },
250 {
251 "id": "bindingTool",
252 "properties": "bindingProperties",
253 "spriteSheet": true,
254 "action": "bindingTool",
255 "toolTip": "Binding (B)",
256 "cursor": "url('images/cursors/binding.png'),default",
257 "lastInGroup": true,
258 "container": false,
259 "subtools": [],
260 "selected": false
246 } 261 }
247 ] 262 ]
248 }, 263 },