aboutsummaryrefslogtreecommitdiff
path: root/js/data/tools-data.js
diff options
context:
space:
mode:
authorAnanya Sen2012-06-26 16:07:00 -0700
committerAnanya Sen2012-06-26 16:07:00 -0700
commit1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch)
treebc09c9f08ac2faa955995a91a78337276a81eb77 /js/data/tools-data.js
parent3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff)
parent46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff)
downloadninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 },