aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/keyboard-mediator.js
diff options
context:
space:
mode:
authorAnanya Sen2012-02-27 14:24:49 -0800
committerAnanya Sen2012-02-27 14:24:49 -0800
commit15d00c49b522aa471d1ccfbbd33f5c0e721eb89e (patch)
tree5c352c198ed7404f3fe0a9c5915e1727d3003f9f /js/mediators/keyboard-mediator.js
parent604ace9cfc9fae6b6c121259523a9060c5306161 (diff)
parent7e63b5d0b6990b6c0ec0385d35534b91982ac672 (diff)
downloadninja-15d00c49b522aa471d1ccfbbd33f5c0e721eb89e.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-xjs/mediators/keyboard-mediator.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index e5b50b03..62b514ee 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -165,14 +165,14 @@ exports.KeyboardMediator = Montage.create(Component, {
165 // Hand tool 165 // Hand tool
166 if(evt.keyCode === Keyboard.H ) { 166 if(evt.keyCode === Keyboard.H ) {
167 evt.preventDefault(); 167 evt.preventDefault();
168 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]}); 168 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]});
169 return; 169 return;
170 } 170 }
171 171
172 // Zoom tool 172 // Zoom tool
173 if((evt.keyCode === Keyboard.Z) && !(evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {//ctrl or shift key not press with Z 173 if((evt.keyCode === Keyboard.Z) && !(evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {//ctrl or shift key not press with Z
174 evt.preventDefault(); 174 evt.preventDefault();
175 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); 175 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
176 return; 176 return;
177 } 177 }
178 178