Changeset 38197

Timestamp:

08/04/2016 09:06:31 PM (9 years ago)

Author:

ocean90

Message:

Plugins: Also update aria-labels when a plugin update fails.

Previously the label was stuck at "Updating…".

Merge of [38196] to the 4.6 branch.

Props afercia, ocean90.
Props DrewAPicture for review.
See #37556.

Location:

branches/4.6

Files:

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

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

@@ -454 +454 @@
             }
             $message.removeClass( 'updating-message notice-warning' ).addClass( 'notice-error' ).find( 'p' ).html( errorMessage );
+
+            if ( response.pluginName ) {
+                $message.find( 'p' )
+                    .attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', response.pluginName ) );
+            } else {
+                $message.find( 'p' ).removeAttr( 'aria-label' );
+            }
         } else if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
             $card = $( '.plugin-card-' + response.slug )
@@ -468 +475 @@
                 $card.find( '.update-now' )
                     .attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', response.pluginName ) );
+            } else {
+                $card.find( '.update-now' ).removeAttr( 'aria-label' );
             }
 
@@ -1592 +1601 @@
         $( '.button.updating-message' )
             .removeClass( 'updating-message' )
-            .attr( 'aria-label', wp.updates.l10n.updateFailedShort )
+            .removeAttr( 'aria-label' )
             .prop( 'disabled', true )
             .text( wp.updates.l10n.updateFailedShort );
@@ -1599 +1608 @@
             .removeClass( 'updating-message notice-warning' )
             .addClass( 'notice-error' )
-            .find( 'p' ).text( errorMessage );
+            .find( 'p' )
+                .removeAttr( 'aria-label' )
+                .text( errorMessage );
 
         wp.a11y.speak( errorMessage, 'assertive' );