aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/keyboard-mediator.js
diff options
context:
space:
mode:
authorJon Reid2012-06-12 13:32:02 -0700
committerJon Reid2012-06-12 13:32:02 -0700
commit8c55dfcb0a669eef0a3bb406b70868078ef09810 (patch)
treee4d070fe1e67fea38cc0343eda297572da717efa /js/mediators/keyboard-mediator.js
parent8e98ce012f55576ddb979969a3a1d834301af0c7 (diff)
parent7887aafbff794e9c5f918c667e73a8386c38cf02 (diff)
downloadninja-8c55dfcb0a669eef0a3bb406b70868078ef09810.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-xjs/mediators/keyboard-mediator.js7
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.