Changeset 37003 for trunk/src/wp-admin/js/editor-expand.js

Timestamp:

03/16/2016 02:47:29 AM (8 years ago)

Author:

azaozz

Message:

Editor: fix exiting DFW with the keyboard shortcut on Mac (Opt+Ctrl+W).

Fixes #36222.

File:

• trunk/src/wp-admin/js/editor-expand.js (modified) (1 diff)

trunk/src/wp-admin/js/editor-expand.js

@@ -888 +888 @@
 
         function fadeOut( event ) {
-            var key = event && event.keyCode;
-
-            // fadeIn and return on Escape and keyboard shortcut Alt+Shift+W.
-            if ( key === 27 || ( key === 87 && event.altKey && event.shiftKey ) ) {
+            var isMac,
+                key = event && event.keyCode;
+
+            if ( window.navigator.platform ) {
+                isMac = ( window.navigator.platform.indexOf( 'Mac' ) > -1 );
+            }
+
+            // fadeIn and return on Escape and keyboard shortcut Alt+Shift+W and Ctrl+Opt+W.
+            if ( key === 27 || ( key === 87 && event.altKey && ( ( ! isMac && event.shiftKey ) || ( isMac && event.ctrlKey ) ) ) ) {
                 fadeIn( event );
                 return;