diff options
author | Nivesh Rajbhandari | 2012-02-27 16:24:13 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-27 16:24:13 -0800 |
commit | a70c62891d0c7dd032d9382c50d1555ab81c4e33 (patch) | |
tree | 7d70793bd0dbbb8bdc8299ca63b235683be5f0bf | |
parent | ef38731ae2769dcb2247db599cdfe62d38e34b28 (diff) | |
download | ninja-a70c62891d0c7dd032d9382c50d1555ab81c4e33.tar.gz |
Fixing tooltips and keyboard shortcuts for 3d tools.
IKNinja-1014 and IKNinja-1015.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-x | js/data/tools-data.js | 6 | ||||
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index cf48757d..a3a30b57 100755 --- 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 (W)", | 40 | "toolTip": "3D Object Rotate 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 (G)", | 51 | "toolTip": "3D Object Translate Tool (G)", |
52 | "cursor": "auto", | 52 | "cursor": "auto", |
53 | "lastInGroup": true, | 53 | "lastInGroup": true, |
54 | "container": false, | 54 | "container": false, |
@@ -195,7 +195,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
195 | "properties": "rotateStageProperties", | 195 | "properties": "rotateStageProperties", |
196 | "spriteSheet": true, | 196 | "spriteSheet": true, |
197 | "action": "RotateStageTool3D", | 197 | "action": "RotateStageTool3D", |
198 | "toolTip": "3D Rotate Stage Tool", | 198 | "toolTip": "3D Stage Rotate Tool (M)", |
199 | "cursor": "auto", | 199 | "cursor": "auto", |
200 | "lastInGroup": false, | 200 | "lastInGroup": false, |
201 | "container": false, | 201 | "container": false, |
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 5b044f8a..a2589340 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -162,6 +162,13 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
162 | return; | 162 | return; |
163 | } | 163 | } |
164 | 164 | ||
165 | // Rotate Stage Tool is M | ||
166 | if(evt.keyCode === Keyboard.M ) { | ||
167 | evt.preventDefault(); | ||
168 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]}); | ||
169 | return; | ||
170 | } | ||
171 | |||
165 | // Hand tool | 172 | // Hand tool |
166 | if(evt.keyCode === Keyboard.H ) { | 173 | if(evt.keyCode === Keyboard.H ) { |
167 | evt.preventDefault(); | 174 | evt.preventDefault(); |