Changeset 36558

Timestamp:

02/17/2016 07:41:14 PM (9 years ago)

Author:

ocean90

Message:

Updates: Prevent further actions if an update button is disabled.

Props adamsilverstein, afercia.
Fixes #35257.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-plugin-install-list-table.php (modified) (1 diff)
• js/updates.js (modified) (1 diff)

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

@@ -462 +462 @@
                         if ( $status['url'] ) {
                             /* translators: 1: Plugin name and version */
-                            $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+                            $action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
                         }
 

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

@@ -525 +525 @@
             var $button = $( e.target );
 
+            // Do nothing while updating and when the button is disabled.
+            if ( $button.hasClass( 'updating-message' ) || $button.hasClass( 'button-disabled' ) ) {
+                return;
+            }
+
             if ( wp.updates.shouldRequestFilesystemCredentials && ! wp.updates.updateLock ) {
                 wp.updates.requestFilesystemCredentials( e );