diff options
author | hwc487 | 2012-06-12 15:52:35 -0700 |
---|---|---|
committer | hwc487 | 2012-06-12 15:52:35 -0700 |
commit | 9490f816924e9e9c9970ef9384241c07ec0a6e9f (patch) | |
tree | f44449a2e0055e21960a5513fb3a0738a91db528 /js/mediators/keyboard-mediator.js | |
parent | b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-9490f816924e9e9c9970ef9384241c07ec0a6e9f.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
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. |