From cc0e582a67cad80c0c1c98a6251733d2db2e8c2f Mon Sep 17 00:00:00 2001
From: Aaron Jorbin <jorbin@git.wordpress.org>
Date: Thu, 19 Mar 2015 05:26:00 +0000
Subject: [PATCH] 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




git-svn-id: https://develop.svn.wordpress.org/trunk@31831 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-plugins-list-table.php  |  6 ++++-
 src/wp-admin/js/updates.js                    | 25 ++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
index 1ade73caac..5d0c78fd8e 100644
--- a/src/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugins-list-table.php
@@ -515,7 +515,11 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
 			$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();
 
diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js
index d9d7afa53b..77f0399486 100644
--- a/src/wp-admin/js/updates.js
+++ b/src/wp-admin/js/updates.js
@@ -138,7 +138,7 @@ window.wp = window.wp || {};
 	wp.updates.updatePlugin = function( plugin, slug ) {
 		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' );
 		}
@@ -185,21 +185,22 @@ window.wp = window.wp || {};
 	 * @param {object} response
 	 */
 	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' );
+			$updateMessage = $( '.plugin-card-' + response.slug ).find( '.update-now' );
+			$updateMessage.addClass( 'button-disabled' );
 		}
 
-		$message.removeClass( 'updating-message' ).addClass( 'updated-message' );
-		$message.text( wp.updates.l10n.updated );
+		$updateMessage.removeClass( 'updating-message' ).addClass( 'updated-message' );
+		$updateMessage.text( wp.updates.l10n.updated );
 		wp.a11y.speak( wp.updates.l10n.updatedMsg );
 
 		wp.updates.decrementCount( 'plugin' );
@@ -229,7 +230,7 @@ window.wp = window.wp || {};
 			return;
 		}
 		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' );
 		}