Changeset 31831

Timestamp:

03/19/2015 05:26:00 AM (9 years ago)

Author:

jorbin

Message:

Ensure that we target the correct plugin row for update updates

The DOM traversal of the plugins list table was less than ideal. By switching to data attributes, we can better target the DOM elements we want to update.

Props ericlewis
Fixes #31621

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-plugins-list-table.php (modified) (1 diff)
• js/updates.js (modified) (3 diffs)

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

@@ -516 +516 @@
             $class .= ' update';
 
-        echo "<tr id='$id' class='$class'>";
+        printf( "<tr id='%s' class='%s' data-slug='%s'>",
+            $id,
+            $class,
+            $plugin_data['slug']
+        );
 
         list( $columns, $hidden ) = $this->get_column_info();

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

@@ -139 +139 @@
         var $message;
         if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-            $message = $( '#' + slug ).next().find( '.update-message' );
+            $message = $( '[data-slug="' + slug + '"]' ).next().find( '.update-message' );
         } else if ( 'plugin-install' === pagenow ) {
             $message = $( '.plugin-card-' + slug ).find( '.update-now' );
@@ -186 +186 @@
      */
     wp.updates.updateSuccess = function( response ) {
-        var $message;
+        var $updateMessage;
         if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-            $message = $( '#' + response.slug ).next().find( '.update-message' );
-            $( '#' + response.slug ).addClass( 'updated' ).removeClass( 'update' );
-            $( '#' + response.slug + '-update' ).addClass( 'updated' ).removeClass( 'update' );
+            var $pluginRow = $( '[data-slug="' + response.slug + '"]' ).first();
+            $updateMessage = $pluginRow.next().find( '.update-message' );
+            $pluginRow.addClass( 'updated' ).removeClass( 'update' );
+
             // Update the version number in the row.
-            var newText = $( '#' + response.slug ).find('.plugin-version-author-uri').html().replace( response.oldVersion, response.newVersion );
-            $( '#' + response.slug ).find('.plugin-version-author-uri').html( newText );
+            var newText = $pluginRow.find('.plugin-version-author-uri').html().replace( response.oldVersion, response.newVersion );
+            $pluginRow.find('.plugin-version-author-uri').html( newText );
         } else if ( 'plugin-install' === pagenow ) {
-            $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
-            $message.addClass( 'button-disabled' );
-        }
-
-        $message.removeClass( 'updating-message' ).addClass( 'updated-message' );
-        $message.text( wp.updates.l10n.updated );
+            $updateMessage = $( '.plugin-card-' + response.slug ).find( '.update-now' );
+            $updateMessage.addClass( 'button-disabled' );
+        }
+
+        $updateMessage.removeClass( 'updating-message' ).addClass( 'updated-message' );
+        $updateMessage.text( wp.updates.l10n.updated );
         wp.a11y.speak( wp.updates.l10n.updatedMsg );
 
@@ -230 +231 @@
         }
         if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-            $message = $( '#' + response.slug ).next().find( '.update-message' );
+            $message = $( '[data-slug="' + response.slug + '"]' ).next().find( '.update-message' );
         } else if ( 'plugin-install' === pagenow ) {
             $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );