Ticket #22237: customizer-esc-2015-06-30.diff

wp-admin/js/customize-controls.js

@@ -3095 +3095 @@
                         event.preventDefault();
                 });
 
+                $( 'body' ).on( 'keydown', function( event ) {
+                        
+                        if ( 27 !== event.which ) {
+                                return;
+                        }
+
+                        var foundExpandedContainer = false;
+
+                        // Check for expanded sections, return when/if found.
+                        api.section.each( function ( section ) {
+                                if ( section.expanded() ) {
+                                        section.collapse();
+                                        foundExpandedContainer = true;
+                                        return;
+                                }
+                        });
+
+                        if ( foundExpandedContainer ) {
+                                return;
+                        }
+
+                        // Check for expanded panels, return when/if found.
+                        api.panel.each( function ( panel ) {
+                                if ( panel.expanded() ) {
+                                        panel.collapse();
+                                        foundExpandedContainer = true;
+                                        return;
+                                }
+                        });
+
+                        if ( foundExpandedContainer ) {
+                                return;
+                        }
+
+                        // Otherwise, collapse the customizer.
+                        if ( overlay.hasClass( 'expanded' ) ) {
+                                overlay.removeClass( 'expanded' ).addClass( 'collapsed' );
+                        }
+
+                        event.preventDefault();
+                });
+
                 $( '.customize-controls-preview-toggle' ).on( 'click keydown', function( event ) {
                         if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
                                 return;