aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/keyboard-mediator.js
diff options
context:
space:
mode:
authorAnanya Sen2012-06-07 11:59:32 -0700
committerAnanya Sen2012-06-07 11:59:32 -0700
commit7378b6846f140106490f10c02cd7cec6a19023aa (patch)
tree90b60c007696b4a73c29abbae82562f69f15c11a /js/mediators/keyboard-mediator.js
parentaea0e6879abfef02a827ed239ef091c3b96d6eb2 (diff)
parentb75fe9369f7caec0351d298f7106c8d59572b440 (diff)
downloadninja-7378b6846f140106490f10c02cd7cec6a19023aa.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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.