Changeset 30625

Timestamp:

11/29/2014 02:44:37 AM (10 years ago)

Author:

azaozz

Message:

Editor: fix fading out on Escape in DFW v2. props adamsilverstein, fixes #30528.

File:

• trunk/src/wp-admin/js/editor-expand.js (modified) (3 diffs)

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

@@ -877 +877 @@
             // fadeIn and return on Escape and keyboard shortcut Alt+Shift+W.
             if ( key === 27 || ( key === 87 && event.altKey && event.shiftKey ) ) {
-                fadeIn();
+                fadeIn( event );
                 return;
             }
@@ -995 +995 @@
         }
 
-        function fadeIn() {
+        function fadeIn( event ) {
             if ( faded ) {
                 faded = false;
@@ -1009 +1009 @@
                 $overlay.off( 'mouseenter.focus mouseleave.focus mousemove.focus touchstart.focus' );
 
-                $editor.on( 'mouseenter.focus', function() {
-                    if ( $.contains( $editor.get( 0 ), document.activeElement ) || editorHasFocus ) {
-                        fadeOut();
-                    }
-                } );
+                /*
+                 * When fading in, temporarily watch for refocus and fade back out - helps
+                 * with 'accidental' editor exits with the mouse. When fading in and the event
+                 * is a key event (Escape or Alt+Shift+W) don't watch for refocus.
+                 */
+                if ( 'undefined' === typeof event ) {
+                    $editor.on( 'mouseenter.focus', function() {
+                        if ( $.contains( $editor.get( 0 ), document.activeElement ) || editorHasFocus ) {
+                            fadeOut();
+                        }
+                    } );
+                }
 
                 focusLostTimer = setTimeout( function() {