diff options
author | Jonathan Duran | 2012-02-25 16:17:51 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-25 16:17:51 -0800 |
commit | 1bc2de516c86f67c2107bd50df0589a273f4c5ab (patch) | |
tree | bd30d9c6512b47ecdb27695bd5a2900f63e62996 /js/mediators | |
parent | 9dabdd11b7fc8a042e139457748547ffe2232468 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1bc2de516c86f67c2107bd50df0589a273f4c5ab.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 4 |
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 | ||