Ticket #35350: 35350.diff

src/wp-admin/includes/plugin-install.php

@@ -651 +651 @@
                                 break;
                         case 'update_available':
                                 if ( $status['url'] ) {
-                                        echo '<a data-slug="' . esc_attr( $api->slug ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
+                                        echo '<a data-slug="' . esc_attr( $api->slug ) . '" data-plugin="' . esc_attr( $status['file'] ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
                                 }
                                 break;
                         case 'newer_installed':

src/wp-admin/js/updates.js

@@ -150 +150 @@
                         $card = $( '.plugin-card-' + slug );
 
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-                        $message = $( '[data-slug="' + slug + '"]' ).next().find( '.update-message' );
+                        $message = $( '[data-plugin="' + plugin + '"]' ).next().find( '.update-message' );
                 } else if ( 'plugin-install' === pagenow ) {
                         $message = $card.find( '.update-now' );
                         name = $message.data( 'name' );
@@ -207 +207 @@
         wp.updates.updateSuccess = function( response ) {
                 var $updateMessage, name, $pluginRow, newText;
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-                        $pluginRow = $( '[data-slug="' + response.slug + '"]' ).first();
+                        $pluginRow = $( '[data-plugin="' + response.plugin + '"]' ).first();
                         $updateMessage = $pluginRow.next().find( '.update-message' );
                         $pluginRow.addClass( 'updated' ).removeClass( 'update' );
 
@@ -268 +268 @@
                 error_message = wp.updates.l10n.updateFailed.replace( '%s', response.error );
 
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-                        $message = $( '[data-slug="' + response.slug + '"]' ).next().find( '.update-message' );
+                        $message = $( '[data-plugin="' + response.plugin + '"]' ).next().find( '.update-message' );
                         $message.html( error_message ).removeClass( 'updating-message' );
                 } else if ( 'plugin-install' === pagenow ) {
                         $button = $card.find( '.update-now' );
@@ -431 +431 @@
          */
         wp.updates.requestForCredentialsModalCancel = function() {
                 // no updateLock and no updateQueue means we already have cleared things up
-                var slug, $message;
+                var data, $message;
 
                 if( wp.updates.updateLock === false && wp.updates.updateQueue.length === 0 ){
                         return;
                 }
 
-                slug = wp.updates.updateQueue[0].data.slug,
+                data = wp.updates.updateQueue[0].data;
 
                 // remove the lock, and clear the queue
                 wp.updates.updateLock = false;
@@ -445 +445 @@
 
                 wp.updates.requestForCredentialsModalClose();
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-                        $message = $( '[data-slug="' + slug + '"]' ).next().find( '.update-message' );
+                        $message = $( '[data-plugin="' + data.plugin + '"]' ).next().find( '.update-message' );
                 } else if ( 'plugin-install' === pagenow ) {
-                        $message = $( '.plugin-card-' + slug ).find( '.update-now' );
+                        $message = $( '.plugin-card-' + data.slug ).find( '.update-now' );
                 }
 
                 $message.removeClass( 'updating-message' );
@@ -516 +516 @@
                         }
                         var updateRow = $( e.target ).parents( '.plugin-update-tr' );
                         // Return the user to the input box of the plugin's table row after closing the modal.
-                        wp.updates.$elToReturnFocusToFromCredentialsModal = $( '#' + updateRow.data( 'slug' ) ).find( '.check-column input' );
+                        wp.updates.$elToReturnFocusToFromCredentialsModal = updateRow.prev().find( '.check-column input' );
                         wp.updates.updatePlugin( updateRow.data( 'plugin' ), updateRow.data( 'slug' ) );
                 } );
 
@@ -544 +544 @@
 
                         data = {
                                 'action' : 'updatePlugin',
+                                'plugin' : $(this).data('plugin'),
                                 'slug'   : $(this).data('slug')
                         };
 
@@ -576 +577 @@
                                 tb_remove();
                                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
                                         // Return the user to the input box of the plugin's table row after closing the modal.
-                                        $( '#' + message.slug ).find( '.check-column input' ).focus();
+                                        $( '[data-plugin="' + message.plugin + '"]' ).first().find( '.check-column input' ).focus();
                                         // trigger the update
-                                        $( '.plugin-update-tr[data-slug="' + message.slug + '"]' ).find( '.update-link' ).trigger( 'click' );
+                                        $( '.plugin-update-tr[data-plugin="' + message.plugin + '"]' ).find( '.update-link' ).trigger( 'click' );
                                 } else if ( 'plugin-install' === pagenow ) {
                                         $( '.plugin-card-' + message.slug ).find( '.column-name a' ).focus();
-                                        $( '.plugin-card-' + message.slug ).find( '[data-slug="' + message.slug + '"]' ).trigger( 'click' );
+                                        $( '.plugin-card-' + message.slug ).find( '[data-plugin="' + message.plugin + '"]' ).trigger( 'click' );
                                 }
                                 break;
                 }