Ticket #21283: 21283.15.diff

wp-includes/js/customize-loader.js

@@ -29 +29 @@
                                 event.preventDefault();
 
                                 // Load the theme.
-                                Loader.open( $(this).attr('href') );
+                                Loader.open( $(this).attr('href'), $(this) );
                         });
 
                         // Add navigation listeners.
@@ -60 +60 @@
                                 Loader.close();
                 },
 
-                open: function( src ) {
+                open: function( src, linkClicked ) {
                         var hash;
 
                         if ( this.active )
@@ -109 +109 @@
                                 history.pushState( { customize: src }, '', src );
                         else if ( ! $.support.history && $.support.hashchange && hash )
                                 window.location.hash = 'wp_customize=on&' + hash;
+                        
+                        // Capture link id to return focus to after closing customizer
+                        if ( linkClicked )
+                                _wpCustomizeLoaderSettings[ 'returnFocus' ]     = linkClicked;
 
                         this.trigger( 'open' );
                 },
@@ -123 +127 @@
                         this.active = false;
 
                         this.trigger( 'close' );
+                        
+                        // Return focus to link that was originally clicked
+                        _wpCustomizeLoaderSettings[ 'returnFocus' ].focus();
                 },
 
                 closed: function() {

wp-admin/js/customize-controls.js

@@ -876 +876 @@
                 $('.back').keydown( function( event ) {
                         if ( 9 === event.which ) // tab
                                 return;
-                        var thisHref = $(this).attr('href');
                         if ( 13 === event.which ) // enter
-                                window.location = thisHref;
+                                parent.send( 'close' );
                         event.preventDefault();
                 });