aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-02 15:35:27 -0800
committerNivesh Rajbhandari2012-02-02 15:49:36 -0800
commit737169d194fc29c82ee784b561065f287e259f88 (patch)
tree3c9e9fa22f96cb109b942f9614910cd0cac6f287 /js
parentd41dee0c552a30724a146965ae4272a268777fc5 (diff)
downloadninja-737169d194fc29c82ee784b561065f287e259f88.tar.gz
Fixing keyboard shortcut and tooltip for hand and 3d tools.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/data/tools-data.js6
-rw-r--r--js/mediators/keyboard-mediator.js6
2 files changed, 9 insertions, 3 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8ea84574..de965dbc 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
37 "properties": "rotate3DProperties", 37 "properties": "rotate3DProperties",
38 "spriteSheet": true, 38 "spriteSheet": true,
39 "action": "Rotate3DTool", 39 "action": "Rotate3DTool",
40 "toolTip": "3D Rotate Object Tool", 40 "toolTip": "3D Rotate Object Tool (W)",
41 "cursor": "auto", 41 "cursor": "auto",
42 "lastInGroup": false, 42 "lastInGroup": false,
43 "container": false, 43 "container": false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
48 "properties": "translate3DProperties", 48 "properties": "translate3DProperties",
49 "spriteSheet": true, 49 "spriteSheet": true,
50 "action": "Translate3DTool", 50 "action": "Translate3DTool",
51 "toolTip": "3D Translate Object Tool", 51 "toolTip": "3D Translate Object Tool (G)",
52 "cursor": "auto", 52 "cursor": "auto",
53 "lastInGroup": true, 53 "lastInGroup": true,
54 "container": false, 54 "container": false,
@@ -206,7 +206,7 @@ exports.ToolsData = Montage.create(Montage, {
206 "properties": "panProperties", 206 "properties": "panProperties",
207 "spriteSheet": true, 207 "spriteSheet": true,
208 "action": "PanTool", 208 "action": "PanTool",
209 "toolTip": "Pan Tool", 209 "toolTip": "Hand Tool (H)",
210 "cursor": "url('images/tools/hand_down.png'), default", 210 "cursor": "url('images/tools/hand_down.png'), default",
211 "lastInGroup": false, 211 "lastInGroup": false,
212 "container": false, 212 "container": false,
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 144932c0..a1fdead3 100644
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -178,6 +178,12 @@ exports.KeyboardMediator = Montage.create(Component, {
178 return; 178 return;
179 } 179 }
180 180
181 if(evt.keyCode === Keyboard.H ) {
182 evt.preventDefault();
183 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
184 return;
185 }
186
181 if(evt.keyCode === Keyboard.Z ) { 187 if(evt.keyCode === Keyboard.Z ) {
182 evt.preventDefault(); 188 evt.preventDefault();
183 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[16]}); 189 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[16]});