Changeset 38210 for branches/4.6

Timestamp:

08/05/2016 11:00:30 PM (10 years ago)

Author:

ocean90

Message:

Update/Install: Remove the .notice-error class before adding classes for the update process.

Prevents displaying an update message with error styling.

Merge of [38209] to the 4.6 branch.

Props obenland.
Props SergeyBiryukov for review.
See #37550.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-admin/js/updates.js (modified) (3 diffs)

branches/4.6/src/wp-admin/js/updates.js

@@ -351 +351 @@
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
                         $updateRow = $( 'tr[data-plugin="' + args.plugin + '"]' );
-                        $message   = $updateRow.find( '.update-message' ).addClass( 'updating-message' ).find( 'p' );
+                        $message   = $updateRow.find( '.update-message' ).removeClass( 'notice-error' ).addClass( 'updating-message notice-warning' ).find( 'p' );
                         message    = wp.updates.l10n.updatingLabel.replace( '%s', $updateRow.find( '.plugin-title strong' ).text() );
                 } else if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
@@ -901 +901 @@
 
                 if ( 'themes-network' === pagenow ) {
-                        $notice = $( '[data-slug="' + args.slug + '"]' ).find( '.update-message' ).addClass( 'updating-message' ).find( 'p' );
+                        $notice = $( '[data-slug="' + args.slug + '"]' ).find( '.update-message' ).removeClass( 'notice-error' ).addClass( 'updating-message notice-warning' ).find( 'p' );
 
                 } else {
@@ -2028 +2028 @@
                                         success++;
                                 } else {
-                                        itemName = response.pluginName ? response.pluginName : $( '[data-slug="' + response.slug + '"]' ).find( '.theme-title strong' ).text();
+                                        itemName = response.pluginName ? response.pluginName : $( '[data-slug="' + response.slug + '"]' ).find( '.column-primary strong' ).text();
 
                                         error++;