Merge ec4eb83 into 1670ea9

django-cms · Dec 5, 2016 · 9527265 · 9527265
2 parents 1670ea9 + ec4eb83
commit 9527265
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -12,6 +12,8 @@
 * Fixed a regression which prevented users from overriding content in an inherited
   placeholder.
 * Added official support for Django 1.10.
+* Fixed a bug where plugin save would incorrectly be triggered on pressing
+  command and then enter in Firefox.
 
 
 === 3.4.1 (2016-10-04) ===

diff --git a/cms/static/cms/js/dist/3.4.1/bundle.toolbar.min.js b/cms/static/cms/js/dist/3.4.1/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/modules/cms.modal.js b/cms/static/cms/js/modules/cms.modal.js
@@ -1215,12 +1215,13 @@ Modal._setupCtrlEnterSave = function _setupCtrlEnterSave(doc) {
         }
     }).on('keyup.cms.submit', function (e) {
         if (mac) {
-            if (e.keyCode === KEYS.CMD_LEFT || e.keyCode === KEYS.CMD_RIGHT) {
+            if (e.keyCode === KEYS.CMD_LEFT ||
+                e.keyCode === KEYS.CMD_RIGHT ||
+                e.keyCode === KEYS.CMD_FIREFOX) {
                 cmdPressed = false;
             }
         }
     });
-
 };
 
 module.exports = Modal;
diff --git a/cms/tests/frontend/unit/cms.modal.test.js b/cms/tests/frontend/unit/cms.modal.test.js
@@ -1847,6 +1847,29 @@ describe('CMS.Modal', function () {
             expect(spy).toHaveBeenCalledTimes(3);
         });
 
+        it('does not trigger modal action if cmd enter was pressed on mac through subsequent keystrokes', function () {
+            spyOn(String.prototype, 'toLowerCase').and.returnValue('mac');
+            CMS.Modal._setupCtrlEnterSave(document);
+
+            doc.trigger(new $.Event('keydown', { keyCode: CMS.KEYS.CMD_LEFT }));
+            doc.trigger(new $.Event('keyup', { keyCode: CMS.KEYS.CMD_LEFT }));
+            doc.trigger(new $.Event('keydown', { keyCode: CMS.KEYS.ENTER }));
+            doc.trigger(new $.Event('keyup', { keyCode: CMS.KEYS.ENTER }));
+            expect(spy).not.toHaveBeenCalled();
+
+            doc.trigger(new $.Event('keydown', { keyCode: CMS.KEYS.CMD_RIGHT }));
+            doc.trigger(new $.Event('keyup', { keyCode: CMS.KEYS.CMD_RIGHT }));
+            doc.trigger(new $.Event('keydown', { keyCode: CMS.KEYS.ENTER }));
+            doc.trigger(new $.Event('keyup', { keyCode: CMS.KEYS.ENTER }));
+            expect(spy).not.toHaveBeenCalled();
+
+            doc.trigger(new $.Event('keydown', { keyCode: CMS.KEYS.CMD_FIREFOX }));
+            doc.trigger(new $.Event('keyup', { keyCode: CMS.KEYS.CMD_FIREFOX }));
+            doc.trigger(new $.Event('keydown', { keyCode: CMS.KEYS.ENTER }));
+            doc.trigger(new $.Event('keyup', { keyCode: CMS.KEYS.ENTER }));
+            expect(spy).not.toHaveBeenCalled();
+        });
+
         it('does not trigger modal action if cmd+enter is pressed on win', function () {
             spyOn(String.prototype, 'toLowerCase').and.returnValue('win');
             CMS.Modal._setupCtrlEnterSave(document);