Ticket #37563: 37563.4.diff

src/wp-admin/js/updates.js

@@ -1466 +1466 @@
                         return;
                 }
 
-                _.each( wp.updates.queue, function( job ) {
-                        $document.trigger( 'credential-modal-cancel', job );
-                } );
+                $document.trigger( 'credential-modal-cancel', wp.updates.queue[0] );
 
                 // Remove the lock, and clear the queue.
                 wp.updates.ajaxLocked = false;
@@ -1708 +1706 @@
                                 $message = $updatingMessage;
                         }
 
-                        if ( $message ) {
+                        if ( $message && $message.hasClass( 'updating-message' ) ) {
                                 originalText = $message.data( 'originaltext' );
 
                                 if ( 'undefined' === typeof originalText ) {
@@ -1993 +1991 @@
 
                         // Find all the checkboxes which have been checked.
                         itemsSelected.each( function( index, element ) {
-                                var $checkbox  = $( element ),
+                                var $checkbox = $( element ),
                                         $itemRow = $checkbox.parents( 'tr' );
 
-                                // Un-check the box.
-                                $checkbox.prop( 'checked', false );
-
                                 // Only add update-able items to the update queue.
                                 if ( 'update-selected' === bulkAction && ( ! $itemRow.hasClass( 'update' ) || $itemRow.find( 'notice-error' ).length ) ) {
+
+                                        // Un-check the box.
+                                        $checkbox.prop( 'checked', false );
                                         return;
                                 }
 
@@ -2016 +2014 @@
 
                         // Display bulk notification for updates of any kind.
                         $document.on( 'wp-plugin-update-success wp-plugin-update-error wp-theme-update-success wp-theme-update-error', function( event, response ) {
-                                var $bulkActionNotice, itemName;
+                                var $itemRow = $( '[data-slug="' + response.slug + '"]' ),
+                                        $bulkActionNotice, itemName;
 
                                 if ( 'wp-' + response.update + '-update-success' === event.type ) {
                                         success++;
                                 } else {
-                                        itemName = response.pluginName ? response.pluginName : $( '[data-slug="' + response.slug + '"]' ).find( '.theme-title strong' ).text();
+                                        itemName = response.pluginName ? response.pluginName : $itemRow.find( '.theme-title strong' ).text();
 
                                         error++;
                                         errorMessages.push( itemName + ': ' + response.errorMessage );
                                 }
 
+                                $itemRow.find( 'input[name="checked[]"]:checked' ).prop( 'checked', false );
+
                                 wp.updates.adminNotice = wp.template( 'wp-bulk-updates-admin-notice' );
 
                                 wp.updates.addAdminNotice( {