aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/keyboard-mediator.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-21 16:26:52 -0700
committerValerio Virgillito2012-06-21 16:26:52 -0700
commit2af33f19de48bb8fe269c51ceddd1bc1f591651f (patch)
tree564528119093e4e3408ccf180d55ac3d5e413813 /js/mediators/keyboard-mediator.js
parentc411f76d89c543837548085ff468fee0fb4f2ff9 (diff)
parent47be0919aa271e97fd7ca86e65cdf93aeee2bf81 (diff)
downloadninja-2af33f19de48bb8fe269c51ceddd1bc1f591651f.tar.gz
Merge pull request #320 from ananyasen/cut-copy-paste
copy cut paste - project phase 1 check in
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;