Changeset 28455

Timestamp:

05/16/2014 06:16:59 PM (11 years ago)

Author:

azaozz

Message:

DFW: fix closing only the wpLink or media modal when pressing Esc.

Location:

trunk/src

Files:

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

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

@@ -511 +511 @@
             });
 
-            $( window ).on( 'keyup', function( event ) {
+            $( window ).on( 'keydown.wp-fullscreen', 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

@@ -64 +64 @@
     editor.addCommand( 'wpFullScreenOff', fullscreenOff );
 
+    function getExtAPI() {
+        return ( typeof wp !== 'undefined' && wp.editor && wp.editor.fullscreen );
+    }
+
+    // Toggle DFW mode. For use from inside the editor.
     function toggleFullscreen() {
-        // Toggle DFW mode. For use from inside the editor.
-        if ( typeof wp === 'undefined' || ! wp.editor || ! wp.editor.fullscreen ) {
-            return;
-        }
+        var fullscreen = getExtAPI();
 
-        if ( editor.getParam('wp_fullscreen') ) {
-            wp.editor.fullscreen.off();
-        } else {
-            wp.editor.fullscreen.on();
+        if ( fullscreen ) {
+            if ( editor.getParam('wp_fullscreen') ) {
+                fullscreen.off();
+            } else {
+                fullscreen.on();
+            }
         }
     }
@@ -79 +83 @@
     editor.addCommand( 'wpFullScreen', toggleFullscreen );
 
-    editor.on( 'keyup', function( event ) {
+    editor.on( 'keydown', function( event ) {
+        var fullscreen;
+
         // Turn fullscreen off when Esc is pressed.
-        if ( event.keyCode === 27 && wp.editor.fullscreen.settings.visible ) {
-            wp.editor.fullscreen.off();
+        if ( event.keyCode === 27 && ( fullscreen = getExtAPI() ) && fullscreen.settings.visible ) {
+            fullscreen.off();
         }
-    } );
+    });
 
     editor.on( 'init', function() {