Ticket #33060: 33060.patch

src/wp-admin/js/post.js

@@ -607 +607 @@
                 $( '#visibility .edit-visibility').click( function () {
                         if ( $postVisibilitySelect.is(':hidden') ) {
                                 updateVisibility();
-                                $postVisibilitySelect.slideDown('fast').find('input[type="radio"]').first().focus();
+                                $postVisibilitySelect.slideDown( 'fast', function() {
+                                        $postVisibilitySelect.find( 'input[type="radio"]' ).first().focus();
+                                })
                                 $(this).hide();
                         }
                         return false;
@@ -614 +616 @@
                 });
 
                 $postVisibilitySelect.find('.cancel-post-visibility').click( function( event ) {
+                        // Move focus back to the Edit link.
+                        $( '#visibility .edit-visibility' ).show().focus();
                         $postVisibilitySelect.slideUp('fast');
                         $('#visibility-radio-' + $('#hidden-post-visibility').val()).prop('checked', true);
                         $('#post_password').val($('#hidden-post-password').val());
                         $('#sticky').prop('checked', $('#hidden-post-sticky').prop('checked'));
                         $('#post-visibility-display').html(visibility);
-                        $('#visibility .edit-visibility').show().focus();
                         updateText();
                         event.preventDefault();
                 });
 
                 $postVisibilitySelect.find('.save-post-visibility').click( function( event ) { // crazyhorse - multiple ok cancels
+                        // Move focus back to the Edit link.
+                        $( '#visibility .edit-visibility' ).show().focus();
                         $postVisibilitySelect.slideUp('fast');
-                        $('#visibility .edit-visibility').show();
                         updateText();
 
                         if ( $postVisibilitySelect.find('input:radio:checked').val() != 'public' ) {
@@ -657 +662 @@
                 });
 
                 $timestampdiv.find('.cancel-timestamp').click( function( event ) {
-                        $timestampdiv.slideUp('fast').siblings('a.edit-timestamp').show().focus();
+                        // Move focus back to the Edit link.
+                        $timestampdiv.siblings( 'a.edit-timestamp' ).show().focus();
+                        $timestampdiv.slideUp( 'fast' );
                         $('#mm').val($('#hidden_mm').val());
                         $('#jj').val($('#hidden_jj').val());
                         $('#aa').val($('#hidden_aa').val());
@@ -669 +676 @@
 
                 $timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels
                         if ( updateText() ) {
+                                // Move focus back to the Edit link.
+                                $timestampdiv.siblings( 'a.edit-timestamp' ).show().focus();
                                 $timestampdiv.slideUp('fast');
-                                $timestampdiv.siblings('a.edit-timestamp').show();
                         }
                         event.preventDefault();
                 });
@@ -690 +698 @@
 
                 $postStatusSelect.siblings('a.edit-post-status').click( function( event ) {
                         if ( $postStatusSelect.is( ':hidden' ) ) {
-                                $postStatusSelect.slideDown('fast').find('select').focus();
+                                $postStatusSelect.slideDown( 'fast', function() {
+                                        $postStatusSelect.find( 'select' ).focus()
+                                });
                                 $(this).hide();
                         }
                         event.preventDefault();
@@ -697 +707 @@
                 });
 
                 $postStatusSelect.find('.save-post-status').click( function( event ) {
-                        $postStatusSelect.slideUp('fast').siblings('a.edit-post-status').show();
+                        // Move focus back to the Edit link.
+                        $postStatusSelect.siblings( 'a.edit-post-status' ).show().focus();
+                        $postStatusSelect.slideUp( 'fast' );
                         updateText();
                         event.preventDefault();
                 });
 
                 $postStatusSelect.find('.cancel-post-status').click( function( event ) {
-                        $('#post-status-select').slideUp('fast').siblings( 'a.edit-post-status' ).show().focus();
+                        // Move focus back to the Edit link.
+                        $postStatusSelect.siblings( 'a.edit-post-status' ).show().focus();
+                        $postStatusSelect.slideUp( 'fast' );
                         $('#post_status').val( $('#hidden_post_status').val() );
                         updateText();
                         event.preventDefault();