diff options
author | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
commit | 446f475c35e3d0d5d6cb6ca35346e548de6c36f9 (patch) | |
tree | 0b7e7154979754db2c0ebb7b7908c555068d515d /js/mediators/keyboard-mediator.js | |
parent | 7867aec2620b65605180979b5049cfa154ca7dd1 (diff) | |
parent | 35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (diff) | |
download | ninja-446f475c35e3d0d5d6cb6ca35346e548de6c36f9.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index cce053bc..c7288d28 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -115,7 +115,7 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
115 | 115 | ||
116 | 116 | ||
117 | // Shortcut for Selection Tool is V | 117 | // Shortcut for Selection Tool is V |
118 | if(evt.keyCode === Keyboard.V) { | 118 | if((evt.keyCode === Keyboard.V) && !(evt.ctrlKey || evt.metaKey)) { |
119 | evt.preventDefault(); | 119 | evt.preventDefault(); |
120 | this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex] }); | 120 | this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex] }); |
121 | return; | 121 | return; |