Changeset 42046

Timestamp:

10/31/2017 01:32:15 AM (7 years ago)

Author:

obenland

Message:

Customize: Spiff up theme updates

Fixes UI bugs around theme updates in the Customizer. Theme versions now get updated and users are no longer left alone after a successful update.

Props rinkuyadav999, celloexpressions for initial patch.
Fixes #42365.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (1 diff)
• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-admin/js/updates.js (modified) (4 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-admin/css/customize-controls.css

@@ -2031 +2031 @@
 }
 
-.themes-section-installed_themes .theme .notice-success {
+.themes-section-installed_themes .theme .notice-success:not(.updated-message) {
     display: none; /* Hide "installed" notice on installed themes tab. */
 }

trunk/src/wp-admin/js/customize-controls.js

@@ -3348 +3348 @@
                     if ( 'theme' === control.params.type && control.params.theme.id === response.slug ) {
                         control.params.theme.hasUpdate = false;
-                        control.rerenderAsInstalled( true );
+                        control.params.theme.version = response.newVersion;
+                        setTimeout( function() {
+                            control.rerenderAsInstalled( true );
+                        }, 2000 );
                     }
                 });

trunk/src/wp-admin/js/updates.js

@@ -938 +938 @@
 
             // Update the theme details UI.
-            $notice = $( '#update-theme' ).closest( '.notice' ).removeClass( 'notice-large' );
+            $notice = $( '[data-slug="' + args.slug + '"].notice' ).removeClass( 'notice-large' );
 
             $notice.find( 'h3' ).remove();
 
             // Add the top-level UI, and update both.
-            $notice = $notice.add( $( '#customize-control-theme-installed_' + args.slug ).find( '.update-message' ) );
+            $notice = $notice.add( $( '#customize-control-installed_theme_' + args.slug ).find( '.update-message' ) );
             $notice = $notice.addClass( 'updating-message' ).find( 'p' );
 
@@ -989 +989 @@
 
         if ( 'customize' === pagenow ) {
-            $theme = wp.customize.control( 'installed_theme_' + response.slug ).container;
-        }
-
-        if ( 'themes-network' === pagenow ) {
+            $theme = $( '.updating-message' ).siblings( '.theme-name' );
+
+            if ( $theme.length ) {
+
+                // Update the version number in the row.
+                newText = $theme.html().replace( response.oldVersion, response.newVersion );
+                $theme.html( newText );
+            }
+
+            $notice = $( '.theme-info .notice' ).add( wp.customize.control( 'installed_theme_' + response.slug ).container.find( '.theme' ).find( '.update-message' ) );
+        } else if ( 'themes-network' === pagenow ) {
             $notice = $theme.find( '.update-message' );
 
@@ -1017 +1024 @@
 
         // Show updated message after modal re-rendered.
-        if ( isModalOpen ) {
+        if ( isModalOpen && 'customize' !== pagenow ) {
             $( '.theme-info .theme-author' ).after( wp.updates.adminNotice( updatedMessage ) );
         }
@@ -1047 +1054 @@
 
         if ( 'customize' === pagenow ) {
-            $theme = wp.customize.control( 'installed_theme_' + response.slug ).container;
+            $theme = wp.customize.control( 'installed_theme_' + response.slug ).container.find( '.theme' );
         }
 

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -4277 +4277 @@
         if ( ! is_multisite() && ( current_user_can( 'install_themes' ) || current_user_can( 'update_themes' ) || current_user_can( 'delete_themes' ) ) ) {
             wp_enqueue_script( 'updates' );
+            wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+                'totals' => wp_get_update_data(),
+            ) );
         }
     }