aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/keyboard-mediator.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-25 11:11:33 -0700
committerArmen Kesablyan2012-06-25 11:11:33 -0700
commit35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (patch)
tree337fd4e9ca5c68fd15d3f56a83ff42aa8eade670 /js/mediators/keyboard-mediator.js
parent9fe9bc495af74d963fa7061d4d1a479720133a56 (diff)
parentd24243239f38704580bb3561a3959688b171809b (diff)
downloadninja-35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
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;