Changeset 36221

Timestamp:

01/08/2016 05:47:18 PM (9 years ago)

Author:

obenland

Message:

Plugins: Use plugin file rather than slug as identifier

The plugin file is unique while there can be more than one plugin with the
same slug. This also allows us to simplify the way updates from the plugin
detail iframe are executed.

See [36205].
Fixes #35350.

Location:

trunk/src/wp-admin

Files:

• includes/plugin-install.php (modified) (1 diff)
• js/updates.js (modified) (10 diffs)

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

@@ -652 +652 @@
             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;

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

@@ -151 +151 @@
 
         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' );
@@ -208 +208 @@
         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' );
@@ -269 +269 @@
 
         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 ) {
@@ -432 +432 @@
     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 ){
@@ -438 +438 @@
         }
 
-        slug = wp.updates.updateQueue[0].data.slug,
+        data = wp.updates.updateQueue[0].data;
 
         // remove the lock, and clear the queue
@@ -446 +446 @@
         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' );
         }
 
@@ -517 +517 @@
             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' ) );
         } );
@@ -533 +533 @@
 
         $( '#plugin_update_from_iframe' ).on( 'click' , function( e ) {
-            var target, data;
+            var target, job;
 
             target = window.parent == window ? null : window.parent,
@@ -543 +543 @@
             e.preventDefault();
 
-            data = {
-                'action' : 'updatePlugin',
-                'slug'   : $(this).data('slug')
+            job = {
+                action: 'updatePlugin',
+                type: 'update-plugin',
+                data: {
+                    plugin: $( this ).data( 'plugin' ),
+                    slug: $( this ).data( 'slug' )
+                }
             };
 
-            target.postMessage( JSON.stringify( data ), window.location.origin );
+            target.postMessage( JSON.stringify( job ), window.location.origin );
         });
 
@@ -575 +579 @@
             case 'updatePlugin' :
                 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();
-                    // trigger the update
-                    $( '.plugin-update-tr[data-slug="' + message.slug + '"]' ).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' );
-                }
+
+                wp.updates.updateQueue.push( message );
+                wp.updates.queueChecker();
                 break;
         }