Changeset 38221

Timestamp:

08/09/2016 01:13:08 AM (8 years ago)

Author:

jorbin

Message:

Updates: Improve experience for Bulk Actions when FTP is dismissed.

Before this change, when a bulk update was canceled due dismissing the FTP credentials modal, part of the actions didn't get canceled. This meant the "There is a new version of…” notices become blank and the updates you had checked became unchecked. Now, the notices remain and you are essentially returned to the screen you had before. Strings are also updated to improve ARIA usage.

Fixes #37563.
Props ocean90, swissspidy, obenland, afercia.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (3 diffs)
• src/wp-admin/js/updates.js (modified) (6 diffs)
• src/wp-includes/script-loader.php (modified) (2 diffs)
• tests/qunit/fixtures/updates.js (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -477 +477 @@
                         } elseif ( current_user_can( 'activate_plugins' ) ) {
                             $button_text  = __( 'Activate' );
+                            /* translators: %s: Plugin name */
+                            $button_label = _x( 'Activate %s', 'plugin' );
                             $activate_url = add_query_arg( array(
                                 '_wpnonce'    => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
@@ -485 +487 @@
                             if ( is_network_admin() ) {
                                 $button_text  = __( 'Network Activate' );
+                                /* translators: %s: Plugin name */
+                                $button_label = _x( 'Network Activate %s', 'plugin' );
                                 $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
                             }
@@ -491 +495 @@
                                 '<a href="%1$s" class="button activate-now button-secondary" aria-label="%2$s">%3$s</a>',
                                 esc_url( $activate_url ),
-                                /* translators: %s: Plugin name */
-                                esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin['name'] ) ),
+                                esc_attr( sprintf( $button_label, $plugin['name'] ) ),
                                 $button_text
                             );

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

@@ -524 +524 @@
         }
 
-        $message.text( wp.updates.l10n.installing );
+        if ( $message.html() !== wp.updates.l10n.installing ) {
+            $message.data( 'originaltext', $message.html() );
+        }
 
         $message
             .addClass( 'updating-message' )
-            .attr( 'aria-label', wp.updates.l10n.pluginInstallingLabel.replace( '%s', $message.data( 'name' ) ) );
+            .attr( 'aria-label', wp.updates.l10n.pluginInstallingLabel.replace( '%s', $message.data( 'name' ) ) )
+            .text( wp.updates.l10n.installing );
 
         wp.a11y.speak( wp.updates.l10n.installingMsg, 'polite' );
@@ -1506 +1509 @@
         response = wp.updates._addCallbacks( response, action );
 
-        wp.updates.queue.push( {
+        wp.updates.queue.unshift( {
             action: action,
 
@@ -1709 +1712 @@
             } else if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
                 $message = $( 'tr[data-plugin="' + job.data.plugin + '"]' ).find( '.update-message' );
-            } else if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
-                $message = $( '.update-now.updating-message' );
             } else {
                 $message = $updatingMessage;
             }
 
-            if ( $message ) {
+            if ( $message && $message.hasClass( 'updating-message' ) ) {
                 originalText = $message.data( 'originaltext' );
 
@@ -1725 +1726 @@
                     .removeClass( 'updating-message' )
                     .html( originalText );
+
+                if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
+                    if ( 'update-plugin' === job.action ) {
+                        $message.attr( 'aria-label', wp.updates.l10n.updateNowLabel.replace( '%s', $message.data( 'name' ) ) );
+                    } else if ( 'install-plugin' === job.action ) {
+                        $message.attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', $message.data( 'name' ) ) );
+                    }
+                }
             }
 
@@ -2000 +2009 @@
             // 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;
                 }
@@ -2023 +2032 @@
             // 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( '.column-primary strong' ).text();
+                    itemName = response.pluginName ? response.pluginName : $itemRow.find( '.column-primary 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' );

trunk/src/wp-includes/script-loader.php

@@ -617 +617 @@
                 'update'                     => __( 'Update' ),
                 'updateNow'                  => __( 'Update Now' ),
+                /* translators: %s: Plugin name and version */
+                'updateNowLabel'             => __( 'Update %s now' ),
                 'updateFailedShort'          => __( 'Update Failed!' ),
                 /* translators: %s: Error string for a failed update */
@@ -635 +637 @@
                 'installNow'                 => __( 'Install Now' ),
                 /* translators: %s: Plugin name */
-                'installNowLabel'            => __( 'Install %s' ),
+                'installNowLabel'            => __( 'Install %s now' ),
                 'installing'                 => __( 'Installing...' ),
                 'installed'                  => __( 'Installed!' ),

trunk/tests/qunit/fixtures/updates.js

@@ -10 +10 @@
         'update': 'Update',
         'updateNow': 'Update Now',
+        'updateNowLabel': 'Update %s now',
         'updateFailedShort': 'Update Failed!',
         'updateFailed': 'Update Failed: %s',
@@ -20 +21 @@
         'beforeunload': 'Updates may not complete if you navigate away from this page.',
         'installNow': 'Install Now',
+        'installNowLabel': 'Install %s now',
         'installing': 'Installing...',
         'installed': 'Installed!',