WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://core.svn.wordpress.org/trunk@22756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-21 13:17:10 +00:00
parent e276fc44be
commit 7a4b96d78f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/js/customize-controls.js
View File

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

8
wp-includes/js/customize-loader.js
View File

@ -28,8 +28,10 @@ window.wp = window.wp || {};
$('#wpbody').on( 'click', '.load-customize', function( event ) { $('#wpbody').on( 'click', '.load-customize', function( event ) {
event.preventDefault(); event.preventDefault();
// Store a reference to the link that opened the customizer.
Loader.link = $(this);
// Load the theme. // Load the theme.
Loader.open( $(this).attr('href') ); Loader.open( Loader.link.attr('href') );
}); });
// Add navigation listeners. // Add navigation listeners.
@ -123,6 +125,10 @@ window.wp = window.wp || {};
this.active = false; this.active = false;
this.trigger( 'close' ); this.trigger( 'close' );
// Return focus to link that was originally clicked.
if ( this.link )
this.link.focus();
}, },
closed: function() { closed: function() {