aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 14:12:48 -0700
committerValerio Virgillito2012-04-26 14:12:48 -0700
commit8de97515958eb22208d4d6c1987d71b55141e9e9 (patch)
tree2b7fb08c34bdb97c739a4e16c2b05d2f0df07fc7 /js
parent575c8a8fb6b32d01d48d94b55a0d469ad4ddebc8 (diff)
downloadninja-8de97515958eb22208d4d6c1987d71b55141e9e9.tar.gz
Fixing the eye dropper shortcut.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to '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 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;