Changeset 28443

Timestamp:

05/16/2014 10:42:03 AM (10 years ago)

Author:

SergeyBiryukov

Message:

DFW: Properly handle Esc key when the content is focused or when switching browser tabs.

props avryl.
fixes #28279.

Location:

trunk/src

Files:

• wp-admin/js/wp-fullscreen.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js (modified) (1 diff)

trunk/src/wp-admin/js/wp-fullscreen.js

@@ -511 +511 @@
             });
 
-            $document.on( 'keydown.wp-fullscreen', function( event ) {
-                if ( 27 === event.which && s.visible ) { // Esc
+            $( window ).on( 'keyup', function( event ) {
+                // Turn fullscreen off when Esc is pressed.
+                if ( 27 === event.keyCode && s.visible ) {
                     api.off();
-                    event.stopImmediatePropagation();
                 }
             });

trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js

@@ -79 +79 @@
     editor.addCommand( 'wpFullScreen', toggleFullscreen );
 
+    editor.on( 'keyup', function( event ) {
+        // Turn fullscreen off when Esc is pressed.
+        if ( event.keyCode === 27 && wp.editor.fullscreen.settings.visible ) {
+            wp.editor.fullscreen.off();
+        }
+    } );
+
     editor.on( 'init', function() {
         // Set the editor when initializing from whitin DFW