Merge pull request #653 from daviferreira/button-shift-key

Don't execute button shortcut when shift key is pressed
yabwe · May 29, 2015 · d6053e2 · d6053e2
2 parents ae9835a + 883734e
commit d6053e2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/spec/buttons.spec.js b/spec/buttons.spec.js
@@ -72,6 +72,21 @@ describe('Buttons TestCase', function () {
             });
             expect(editor.execAction).toHaveBeenCalled();
         });
+
+        it('should not execute the button action when shift key is pressed', function () {
+            spyOn(MediumEditor.prototype, 'execAction');
+            var editor = this.newMediumEditor('.editor'),
+                code = 'b'.charCodeAt(0);
+            selectElementContentsAndFire(editor.elements[0]);
+            jasmine.clock().tick(1);
+            fireEvent(editor.elements[0], 'keydown', {
+                keyCode: code,
+                ctrlKey: true,
+                metaKey: true,
+                shiftKey: true
+            });
+            expect(editor.execAction).not.toHaveBeenCalled();
+        });
     });
 
     describe('Buttons with various labels', function () {

diff --git a/src/js/extensions/button.js b/src/js/extensions/button.js
@@ -62,7 +62,7 @@ var Button;
         handleKeydown: function (event) {
             var action;
 
-            if (Util.isKey(event, this.key.charCodeAt(0)) && Util.isMetaCtrlKey(event)) {
+            if (Util.isKey(event, this.key.charCodeAt(0)) && Util.isMetaCtrlKey(event) && !event.shiftKey) {
                 event.preventDefault();
                 event.stopPropagation();
 
@@ -139,4 +139,4 @@ var Button;
             return isMatch;
         }
     });
-}());
+}());