Ticket #59538: 59538.diff

src/js/_enqueues/wp/updates.js

@@ -1208 +1208 @@
         wp.updates.updateThemeSuccess = function( response ) {
                 var isModalOpen    = $( 'body.modal-open' ).length,
                         $theme         = $( '[data-slug="' + response.slug + '"]' ),
+                        OpenModalSlug   = ( isModalOpen ) ? $( '.theme-overlay .toggle-auto-update' ).attr('data-slug') : '',
                         updatedMessage = {
                                 className: 'updated-message notice-success notice-alt',
                                 message:   _x( 'Updated!', 'theme' )
@@ -1233 +1234 @@
                         $theme.find( '.theme-version-author-uri' ).html( newText );
 
                         // Clear the "time to next auto-update" text.
-                        $theme.find( '.auto-update-time' ).empty();
+                        $theme.find( '.auto-update-time' ).empty(); 
                 } else {
-                        $notice = $( '.theme-info .notice' ).add( $theme.find( '.update-message' ) );
+                        $notice = $( 'body:not(.modal-open) .theme-info .notice' ).add( $theme.find( '.update-message' ) );
 
                         // Focus on Customize button after updating.
-                        if ( isModalOpen ) {
+                        if ( isModalOpen && OpenModalSlug == response.slug ) {
                                 $( '.load-customize:visible' ).trigger( 'focus' );
                                 $( '.theme-info .theme-autoupdate' ).find( '.auto-update-time' ).empty();
                         } else {
@@ -1254 +1255 @@
                 $document.trigger( 'wp-theme-update-success', response );
 
                 // Show updated message after modal re-rendered.
-                if ( isModalOpen && 'customize' !== pagenow ) {
+                if ( isModalOpen && 'customize' !== pagenow && OpenModalSlug == response.slug ) {
                         $( '.theme-info .theme-author' ).after( wp.updates.adminNotice( updatedMessage ) );
                 }
         };