diff options
author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js/mediators/keyboard-mediator.js | |
parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
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. |