Ticket #33029: 33029.3.diff

wp-admin/js/common.js

@@ -385 +385 @@
                 var $this = $( this ),
                         $button = $( '<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>' ),
                         btnText = commonL10n.dismiss || '';
+                        focusedElementAtt = 'data-wp-focused-element';
 
                 // Ensure plain text
                 $button.find( '.screen-reader-text' ).text( btnText );
@@ -391 +392 @@
 
                 $this.append( $button );
 
+                // Note currently focused element before removing focus for click event.
+                $button.on( 'mousedown.wp-dismiss-notice', function( event ) {
+                        $( ':focus' ).attr( focusedElementAtt, '' );
+                });
+
                 $button.on( 'click.wp-dismiss-notice', function( event ) {
                         event.preventDefault();
                         $this.fadeTo( 100 , 0, function() {
@@ -398 +404 @@
                                         $(this).remove();
                                 });
                         });
+
+                        // Restore focus to prevously focused element if available, otherwise
+                        // restore focus to the content area & move caret to the end of the content.
+                        var previouslyFocusedElement = $( '[' + focusedElementAtt + ']' );
+                        if ( previouslyFocusedElement.length > 0 ) {
+                                previouslyFocusedElement.focus().removeAttr( focusedElementAtt );
+                        } else {
+                                tinyMCE.activeEditor.focus();
+                                tinyMCE.activeEditor.selection.select( tinyMCE.activeEditor.getBody(), true );
+                                tinyMCE.activeEditor.selection.collapse( false );
+                        }
                 });
+
+
         });
 
         // Init screen meta