diff options
author | Jon Reid | 2012-02-23 17:10:08 -0800 |
---|---|---|
committer | Jon Reid | 2012-02-23 17:10:08 -0800 |
commit | 5570a42a3220a14a614b6dd52fe530e8f436c8b0 (patch) | |
tree | e368f458b89dc20b25a6f09157a3c9ab62307257 /js/mediators | |
parent | 0b18fb2fef124a26204d5dba90cd82c975b69df3 (diff) | |
parent | db2fd02a1b0e909bb536fa63cefd2144f4642ead (diff) | |
download | ninja-5570a42a3220a14a614b6dd52fe530e8f436c8b0.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into Timeline-local
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 0282060f..a4bf9baa 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -162,15 +162,17 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
162 | return; | 162 | return; |
163 | } | 163 | } |
164 | 164 | ||
165 | // Hand tool | ||
165 | if(evt.keyCode === Keyboard.H ) { | 166 | if(evt.keyCode === Keyboard.H ) { |
166 | evt.preventDefault(); | 167 | evt.preventDefault(); |
167 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]}); | 168 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]}); |
168 | return; | 169 | return; |
169 | } | 170 | } |
170 | 171 | ||
172 | // Zoom tool | ||
171 | if(evt.keyCode === Keyboard.Z ) { | 173 | if(evt.keyCode === Keyboard.Z ) { |
172 | evt.preventDefault(); | 174 | evt.preventDefault(); |
173 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[16]}); | 175 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); |
174 | return; | 176 | return; |
175 | } | 177 | } |
176 | 178 | ||