diff options
| author | Jonathan Duran | 2012-04-27 11:47:50 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-27 11:47:50 -0700 |
| commit | dcce4b47305bd67298893c6a3184b831ec28ac71 (patch) | |
| tree | 516d889fc38c4ac5bfa85ee9f3930d1137622487 /js/mediators | |
| parent | 185dae2438e680acfe8c974dc5d653000c380066 (diff) | |
| parent | 917668dbd753d69b346cb9fd2e665fbe257f5311 (diff) | |
| download | ninja-dcce4b47305bd67298893c6a3184b831ec28ac71.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/mediators')
| -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 79967799..f8934669 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
| @@ -180,7 +180,7 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | // Shortcut for Eyedropper Tool is I | 182 | // Shortcut for Eyedropper Tool is I |
| 183 | if(evt.keyCode === Keyboard.I ) { | 183 | if(evt.keyCode === Keyboard.I && !(evt.ctrlKey || evt.metaKey)) { |
| 184 | evt.preventDefault(); | 184 | evt.preventDefault(); |
| 185 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]}); | 185 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]}); |
| 186 | return; | 186 | return; |