diff options
author | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
commit | 32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch) | |
tree | fbf05f2dfc91e57ab9598046ff16798ea0ae1966 /js/mediators/keyboard-mediator.js | |
parent | 60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff) | |
parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
download | ninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 18 |
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(); |