Changeset 27080

Timestamp:

02/03/2014 05:30:12 AM (11 years ago)

Author:

azaozz

Message:

Consolidate "close on Escape" in the media modal, DFW, wpLink and Thickbox. Props kovshenin, fixes #26854.

Location:

trunk/src

Files:

• wp-admin/js/common.js (modified) (1 diff)
• wp-admin/js/wp-fullscreen.js (modified) (2 diffs)
• wp-includes/js/media-views.js (modified) (1 diff)
• wp-includes/js/thickbox/thickbox.js (modified) (2 diffs)
• wp-includes/js/wplink.js (modified) (2 diffs)

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

@@ -702 +702 @@
 })();
 
-// internal use
-$(document).bind( 'wp_CloseOnEscape', function( e, data ) {
-    if ( typeof(data.cb) != 'function' )
-        return;
-
-    if ( typeof(data.condition) != 'function' || data.condition() )
-        data.cb();
-
-    return true;
-});
-
 }( jQuery, window ));

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

@@ -478 +478 @@
                 }
 
-                if ( 27 == c ) { // Esc
-                    data = {
-                        event: e,
-                        what: 'dfw',
-                        cb: api.off,
-                        condition: function(){
-                            if ( $('#TB_window').is(':visible') || $('.wp-dialog').is(':visible') )
-                                return false;
-                            return true;
-                        }
-                    };
-
-                    if ( ! $(document).triggerHandler( 'wp_CloseOnEscape', [data] ) ) {
-                        api.off();
-                    }
-                }
-
                 if ( a && (61 == c || 107 == c || 187 == c) ) { // +
                     api.dfwWidth( 25 );
@@ -508 +491 @@
                     api.dfwWidth( 0 );
                     e.preventDefault();
+                }
+            });
+
+            $document.on( 'keydown.wp-fullscreen', function( event ) {
+                if ( 27 === event.which && s.visible ) { // Esc
+                    api.off();
+                    event.stopImmediatePropagation();
                 }
             });

trunk/src/wp-includes/js/media-views.js

@@ -2348 +2348 @@
         keydown: function( event ) {
             // Close the modal when escape is pressed.
-            if ( 27 === event.which ) {
-                event.preventDefault();
+            if ( 27 === event.which && this.$el.is(':visible') ) {
                 this.escape();
-                return;
+                event.stopImmediatePropagation();
             }
         }

trunk/src/wp-includes/js/thickbox/thickbox.js

@@ -157 +157 @@
 
             jQuery(document).bind('keydown.thickbox', function(e){
-                e.stopImmediatePropagation();
-
                 if ( e.which == 27 ){ // close
-                    if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [{ event: e, what: 'thickbox', cb: tb_remove }] ) )
-                        tb_remove();
+                    tb_remove();
 
                 } else if ( e.which == 190 ){ // display previous image
@@ -245 +242 @@
 
         if(!params['modal']){
-            jQuery(document).bind('keyup.thickbox', function(e){
-
+            jQuery(document).bind('keydown.thickbox', function(e){
                 if ( e.which == 27 ){ // close
-                    e.stopImmediatePropagation();
-                    if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [{ event: e, what: 'thickbox', cb: tb_remove }] ) )
-                        tb_remove();
-
+                    tb_remove();
                     return false;
                 }

trunk/src/wp-includes/js/wplink.js

@@ -305 +305 @@
             var fn, key = $.ui.keyCode;
 
+            if ( key.ESCAPE === event.which ) {
+                wpLink.close();
+                event.stopImmediatePropagation();
+            }
+
             if ( event.which !== key.UP && event.which !== key.DOWN ) {
                 return;
@@ -318 +323 @@
         keyup: function( event ) {
             var key = $.ui.keyCode;
-
-            if ( event.which === key.ESCAPE ) {
-                event.stopImmediatePropagation();
-                if ( ! $(document).triggerHandler( 'wp_CloseOnEscape', [{ event: event, what: 'wplink', cb: wpLink.close }] ) )
-                    wpLink.close();
-                return false;
-            }
 
             if ( event.which === key.UP || event.which === key.DOWN ) {