diff options
| author | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
| commit | d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42 (patch) | |
| tree | 564528119093e4e3408ccf180d55ac3d5e413813 /js/mediators/keyboard-mediator.js | |
| parent | bf6bed611714053aabc0d38978bddd62873d04aa (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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; |