diff options
author | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
commit | b6c88f548c8d3756738e534418732710af733f03 (patch) | |
tree | d651ce2811019a3bccfd8be1326762cd2c601316 /js/mediators/keyboard-mediator.js | |
parent | 91123fef348ec54d89005adbc151e816856a6a18 (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-b6c88f548c8d3756738e534418732710af733f03.tar.gz |
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Valerio Virgillito <valerio@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 e3f41b3f..196c8a4b 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -148,6 +148,13 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
148 | return; | 148 | return; |
149 | } | 149 | } |
150 | 150 | ||
151 | // shortcut for Brush tool is B | ||
152 | if (evt.keyCode === Keyboard.B){ | ||
153 | evt.preventDefault(); | ||
154 | this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.brushToolIndex] }); | ||
155 | return; | ||
156 | } | ||
157 | |||
151 | // Shortcut for Rectangle Tool is R | 158 | // Shortcut for Rectangle Tool is R |
152 | // unless the user is pressing the command key. | 159 | // unless the user is pressing the command key. |
153 | // If the user is pressing the command key, they want to refresh the browser. | 160 | // If the user is pressing the command key, they want to refresh the browser. |