aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/keyboard-mediator.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-18 12:08:46 -0700
committerNivesh Rajbhandari2012-04-18 12:08:46 -0700
commitfb20a74856a8c272d09d106765eb2e44c883f0c3 (patch)
treed41468b2fff52d73c6308de9730c17be05a71394 /js/mediators/keyboard-mediator.js
parente2510cba3b75bba78c587d784f39c137c1618369 (diff)
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-fb20a74856a8c272d09d106765eb2e44c883f0c3.tar.gz
Merge branch 'refs/heads/ninja-internal' into EricMerge
Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-xjs/mediators/keyboard-mediator.js18
1 files changed, 18 insertions, 0 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 82596693..79967799 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -168,6 +168,24 @@ exports.KeyboardMediator = Montage.create(Component, {
168 return; 168 return;
169 } 169 }
170 170
171 // Paint Bucket Tool and Ink Bottle tools share keyboard shortcut K
172 if(evt.keyCode === Keyboard.K ) {
173 evt.preventDefault();
174 if(this.application.ninja.toolsData.selectedTool.id === "FillTool") {
175 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[11]});
176 } else {
177 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[10]});
178 }
179 return;
180 }
181
182 // Shortcut for Eyedropper Tool is I
183 if(evt.keyCode === Keyboard.I ) {
184 evt.preventDefault();
185 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]});
186 return;
187 }
188
171 // Rotate Stage Tool is M 189 // Rotate Stage Tool is M
172 if(evt.keyCode === Keyboard.M ) { 190 if(evt.keyCode === Keyboard.M ) {
173 evt.preventDefault(); 191 evt.preventDefault();