Changeset 32062

Timestamp:

04/07/2015 03:08:38 AM (10 years ago)

Author:

jorbin

Message:

Enable users to initiate a shiny update from plugin detail modal

The plugin detail modal can contain a link to update a plugin. When it does, we should initiate a shiny update.

This relies upon postMessage which isn't available in all browsers, specifically it isn't in IE versions below 8 so this is going to be a progressive enhancement that some small percentage of users will miss out on. These are the same users that can't use the customizer.

Fixes #31739

Location:

trunk/src/wp-admin

Files:

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

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

@@ -562 +562 @@
             case 'update_available':
                 if ( $status['url'] ) {
-                    echo '<a class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
+                    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>';
                 }
                 break;

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

@@ +1 @@
+/* global tb_remove */
 window.wp = window.wp || {};
 
@@ -474 +475 @@
         } );
 
+        //
+        $( '#plugin_update_from_iframe' ).on( 'click' , function( e ) {
+            var target, data;
+
+            target = window.parent == window ? null : window.parent,
+            $.support.postMessage = !! window.postMessage;
+
+            if ( $.support.postMessage === false || target === null )
+                return;
+
+            e.preventDefault();
+
+            data = {
+                'action' : 'updatePlugin',
+                'slug'   : $(this).data('slug')
+            };
+
+            target.postMessage( JSON.stringify( data ), window.location.origin );
+        });
+
     } );
 
@@ -488 +509 @@
         message = $.parseJSON( event.data );
 
-        if ( typeof message.action === 'undefined' || message.action !== 'decrementUpdateCount' ) {
-            return;
-        }
-
-        wp.updates.decrementCount( message.upgradeType );
+        if ( typeof message.action === 'undefined' ) {
+            return;
+        }
+
+        switch (message.action){
+            case 'decrementUpdateCount' :
+                wp.updates.decrementCount( message.upgradeType );
+                break;
+            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( 'h4 a' ).focus();
+                    $( '.plugin-card-' + message.slug ).find( '[data-slug="' + message.slug + '"]' ).trigger( 'click' );
+                }
+                break;
+        }
+
+
 
     } );