aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:03:51 -0800
committerPushkar Joshi2012-02-24 12:03:51 -0800
commit053fc63a2950c7a5ee4ebf98033b64d474a3c46e (patch)
tree8cfd5c51f72624ff1da50f3a2fbed05644ffd8e2 /js/mediators
parenta5ba66ecefa9c9c17e0f5e1725e2141f7a3540a2 (diff)
parent23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff)
downloadninja-053fc63a2950c7a5ee4ebf98033b64d474a3c46e.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/mediators')
-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 a4bf9baa..5b044f8a 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 ) { 173 if(evt.keyCode === Keyboard.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