Ticket #17399: 17399-fix.diff

wp-admin/js/wp-fullscreen.dev.js

@@ -4 +4 @@
  * A lightweight publish/subscribe implementation.
  * Private use only!
  */
-var PubSub, fullscreen, wptitlehint;
+var PubSub, fullscreen, wptitlehint, wpDialogOpen = false;
 
 PubSub = function() {
         this.topics = {};
@@ -486 +486 @@
                                 else
                                         a = e.altKey; // Alt key for Win & Linux
 
-                                if ( 27 == c ) // Esc
-                                        fullscreen.off();
 
                                 if ( a && (61 == c || 187 == c) ) // +
                                         api.dfw_width(25);
@@ -501 +499 @@
                                 return true;
                         });
 
+                        $(document).keydown(function(e){
+                                var c = e.charCode || e.keyCode;
+
+                                // The Esc key check has to be in keydown since Thickbox and tinyMCE's wpDialog
+                                // all handle Esc presses on keydown.
+                                if ( 27 == c && ! wpDialogOpen ) { // Esc
+                                        fullscreen.off();
+                                }
+                        });
+
                         topbar.mouseenter(function(e){
                                 s.toolbars.addClass('fullscreen-make-sticky');
                                 $( document ).unbind( '.fullscreen' );

wp-includes/js/thickbox/thickbox.js

@@ -14 +14 @@
 
 /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
 
+var wpDialogOpen = false;
+
 //on page load call tb_init
 jQuery(document).ready(function(){
         tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
@@ -36 +38 @@
 }
 
 function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
+        wpDialogOpen = true;
 
         try {
                 if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
@@ -283 +286 @@
         }
         document.onkeydown = "";
         document.onkeyup = "";
+
+        // Add a small timeout just to ensure that code that checks wpDialogOpen can
+        // run before the variable is updated.
+        setTimeout( 'wpDialogOpen = false;', 100 );
+
         return false;
 }
 

wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js

@@ +1 @@
+var wpDialogOpen = false;
+
 (function($){
         $.widget("wp.wpdialog", $.ui.dialog, {
                 open: function() {
@@ -13 +15 @@
                                 return;
                         }
 
+                        wpDialogOpen = true;
+
                         // Open the dialog.
                         $.ui.dialog.prototype.open.apply( this, arguments );
                         // WebKit leaves focus in the TinyMCE editor unless we shift focus.
                         this.element.focus();
                         this._trigger('refresh');
+                },
+
+                close: function() {
+                        $.ui.dialog.prototype.close.apply( this, arguments );
+
+                        // Add a small timeout just to ensure that code that checks wpDialogOpen can
+                        // run before the variable is updated.
+                        setTimeout( 'wpDialogOpen = false;', 100 );
                 }
         });
 })(jQuery);