Changeset 22756

Timestamp:

11/21/2012 01:17:10 PM (12 years ago)

Author:

koopersmith

Message:

Customizer: Track the link that was used to open the customizer and restore focus on close. props lessbloat. fixes #21283.

Location:

trunk

Files:

• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-includes/js/customize-loader.js (modified) (2 diffs)

trunk/wp-admin/js/customize-controls.js

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

trunk/wp-includes/js/customize-loader.js

@@ -29 +29 @@
                 event.preventDefault();
 
+                // Store a reference to the link that opened the customizer.
+                Loader.link = $(this);
                 // Load the theme.
-                Loader.open( $(this).attr('href') );
+                Loader.open( Loader.link.attr('href') );
             });
 
@@ -124 +126 @@
 
             this.trigger( 'close' );
+
+            // Return focus to link that was originally clicked.
+            if ( this.link )
+                this.link.focus();
         },