diff options
author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/mediators/keyboard-mediator.js | |
parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index e2e8e937..4fd4bd4c 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -143,6 +143,13 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
143 | return; | 143 | return; |
144 | } | 144 | } |
145 | 145 | ||
146 | // shortcut for Brush tool is B | ||
147 | if (evt.keyCode === Keyboard.B){ | ||
148 | evt.preventDefault(); | ||
149 | this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.brushToolIndex] }); | ||
150 | return; | ||
151 | } | ||
152 | |||
146 | // Shortcut for Rectangle Tool is R | 153 | // Shortcut for Rectangle Tool is R |
147 | // unless the user is pressing the command key. | 154 | // unless the user is pressing the command key. |
148 | // If the user is pressing the command key, they want to refresh the browser. | 155 | // If the user is pressing the command key, they want to refresh the browser. |