Ticket #37563: 37563.diff

src/wp-admin/js/updates.js

@@ -362 +362 @@
                 }
 
                 if ( $message.html() !== wp.updates.l10n.updating ) {
-                        $message.data( 'originaltext', $message.html() );
+                        $message.data({
+                                originaltext: $message.html(),
+                                originalAriaLabel: $message.attr( 'aria-label' )
+                        });
                 }
 
                 $message
@@ -1685 +1688 @@
                  */
                 $document.on( 'credential-modal-cancel', function( event, job ) {
                         var $updatingMessage = $( '.updating-message' ),
-                                $message, originalText;
+                                $message,
+                                $messageHolder,
+                                originalText;
 
                         if ( 'import' === pagenow ) {
                                 $updatingMessage.removeClass( 'updating-message' );
@@ -1701 +1706 @@
                                 originalText = $message.data( 'originaltext' );
 
                                 if ( 'undefined' === typeof originalText ) {
-                                        originalText = $( '<p>' ).html( $message.find( 'p' ).data( 'originaltext' ) );
+                                        $messageHolder = $message.find( 'p' );
+
+                                        /*
+                                         * If no `originaltext` data is available, e.g. for a plugin
+                                         * bulk update, get the element HTML.
+                                         */
+                                        if ( 'undefined' === typeof $messageHolder.data( 'originaltext' ) ) {
+                                                originalText = $( '<p>' ).html( $messageHolder.html() );
+                                        } else {
+                                                originalText = $( '<p>' ).html( $messageHolder.data( 'originaltext' ) );
+                                        }
                                 }
 
                                 $message
                                         .removeClass( 'updating-message' )
                                         .html( originalText );
+
+                                // Restore the original `aria-label` on the plugin "card" button.
+                                if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
+                                        $message.attr( 'aria-label', $message.data( 'originalAriaLabel' ) );
+                                }
                         }
 
                         wp.a11y.speak( wp.updates.l10n.updateCancel, 'polite' );