Ticket #38142: 38142.diff

src/wp-includes/js/media/views/modal.js

@@ -24 +24 @@
                 'keydown': 'keydown'
         },
 
+        clickedOpenerEl: null,
+
         initialize: function() {
                 _.defaults( this.options, {
                         container: document.body,
@@ -91 +93 @@
                         return this;
                 }
 
+                this.clickedOpenerEl = document.activeElement;
+
                 if ( ! this.views.attached ) {
                         this.attach();
                 }
@@ -141 +145 @@
                 // Hide modal and remove restricted media modal tab focus once it's closed
                 this.$el.hide().undelegate( 'keydown' );
 
-                // Put focus back in useful location once modal is closed
-                $('#wpbody-content').focus();
+                // Put focus back in useful location once modal is closed.
+                if ( null !== this.clickedOpenerEl ) {
+                        this.clickedOpenerEl.focus();
+                } else {
+                        $( '#wpbody-content' ).focus();
+                }
 
                 this.propagate('close');
 

src/wp-includes/js/media-editor.js

@@ -1111 +1111 @@
 
                                         event.preventDefault();
 
-                                        // Remove focus from the `.insert-media` button.
-                                        // Prevents Opera from showing the outline of the button
-                                        // above the modal.
-                                        //
-                                        // See: https://core.trac.wordpress.org/ticket/22445
-                                        elem.blur();
-
                                         if ( elem.hasClass( 'gallery' ) ) {
                                                 options.state = 'gallery';
                                                 options.title = wp.media.view.l10n.createGalleryTitle;

src/wp-includes/js/media-views.js

@@ -6698 +6698 @@
                 'keydown': 'keydown'
         },
 
+        clickedOpenerEl: null,
+
         initialize: function() {
                 _.defaults( this.options, {
                         container: document.body,
@@ -6765 +6767 @@
                         return this;
                 }
 
+                this.clickedOpenerEl = document.activeElement;
+
                 if ( ! this.views.attached ) {
                         this.attach();
                 }
@@ -6815 +6819 @@
                 // Hide modal and remove restricted media modal tab focus once it's closed
                 this.$el.hide().undelegate( 'keydown' );
 
-                // Put focus back in useful location once modal is closed
-                $('#wpbody-content').focus();
+                // Put focus back in useful location once modal is closed.
+                if ( null !== this.clickedOpenerEl ) {
+                        this.clickedOpenerEl.focus();
+                } else {
+                        $( '#wpbody-content' ).focus();
+                }
 
                 this.propagate('close');