diff options
| author | Jose Antonio Marquez | 2012-06-21 16:53:46 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-21 16:53:46 -0700 |
| commit | 9a568f56b2684e268975231544a80db78497db02 (patch) | |
| tree | 5e76e47dbec5e5581c9d96beb312c6bbeb910082 /js/mediators/keyboard-mediator.js | |
| parent | 1e9af08f42e4ba18fc8c5a8501d8cbecec0f4fe8 (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-9a568f56b2684e268975231544a80db78497db02.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
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; |