diff options
| author | Jose Antonio Marquez | 2012-04-26 14:39:29 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-26 14:39:29 -0700 |
| commit | d988dead643ff4f9bfa417286a6b5f88be0e7c82 (patch) | |
| tree | d70f26e6d297def4b5438d45bcede78c92e49a6f /js/mediators | |
| parent | 820d3eae09df1871f5abc295e7e659e8cc6b7ee3 (diff) | |
| parent | b03c3b087297f471840ab8595d5aa8bd0249a742 (diff) | |
| download | ninja-d988dead643ff4f9bfa417286a6b5f88be0e7c82.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
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; |