Changeset 31409

Timestamp:

02/11/2015 05:05:13 AM (10 years ago)

Author:

pento

Message:

Shiny Updates: Replace $.post() calls with wp.ajax.post(), and clean up a bunch of the now unnecessary code.

See #29820

Location:

trunk/src

Files:

• wp-admin/js/updates.js (modified) (8 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -1 +1 @@
 window.wp = window.wp || {};
 
-(function( $, wp, pagenow, ajaxurl ) {
+(function( $, wp, pagenow ) {
     wp.updates = {};
 
@@ -123 +123 @@
 
         var data = {
-            'action':      'update-plugin',
             '_ajax_nonce': wp.updates.ajaxNonce,
             'plugin':      plugin,
@@ -129 +128 @@
         };
 
-        $.ajax( {
-            type:      'post',
-            url:       ajaxurl,
-            data:      data,
-            complete:  wp.updates.updateRequestComplete
-        } );
-    };
-
-    /**
-     * After an update attempt has completed, deal with the response.
-     *
-     * @since 4.2.0
-     *
-     * @param  {jqXHR} jqxhr The jQuery XMLHttpRequest for the request.
-     */
-    wp.updates.updateRequestComplete = function( jqxhr ) {
-        wp.updates.updateLock = false;
-        if ( jqxhr.responseJSON && jqxhr.responseJSON.success ) {
-            wp.updates.updateSuccess( jqxhr.responseJSON );
-        } else {
-            var alertText = wp.updates.l10n.updateFailed;
-            if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.error ) {
-                 alertText += ': ' + jqxhr.responseJSON.data.error;
-            }
-            window.alert( alertText );
-            if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.slug ) {
-                wp.updates.updateError( jqxhr.responseJSON );
-            }
-        }
-        /**
-         * Check the queue.
-         */
-        wp.updates.queueChecker();
+        wp.ajax.post( 'update-plugin', data )
+            .done( wp.updates.updateSuccess )
+            .fail( wp.updates.updateError )
+            .always( wp.updates.updateAlways );
     };
 
@@ -174 +144 @@
         var $message;
         if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-            $message = $( '#' + response.data.slug ).next().find( '.update-message' );
-            $( '#' + response.data.slug ).addClass( 'updated' ).removeClass( 'update' );
-            $( '#' + response.data.slug + '-update' ).addClass( 'updated' ).removeClass( 'update' );
+            $message = $( '#' + response.slug ).next().find( '.update-message' );
+            $( '#' + response.slug ).addClass( 'updated' ).removeClass( 'update' );
+            $( '#' + response.slug + '-update' ).addClass( 'updated' ).removeClass( 'update' );
         } else if ( 'plugin-install' === pagenow ) {
-            $message = $( '.plugin-card-' + response.data.slug ).find( '.update-now' );
+            $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
             $message.addClass( 'button-disabled' );
         }
@@ -198 +168 @@
         var $message;
         if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-            $message = $( '#' + response.data.slug ).next().find( '.update-message' );
+            $message = $( '#' + response.slug ).next().find( '.update-message' );
         } else if ( 'plugin-install' === pagenow ) {
-            $message = $( '.plugin-card-' + response.data.slug ).find( '.update-now' );
+            $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
         }
         $message.removeClass( 'updating-message' );
         $message.text( wp.updates.l10n.updateFailed );
     };
+
+    /**
+     * After an update attempt has completed, check the queue.
+     *
+     * @since 4.2.0
+     */
+    wp.updates.updateAlways = function() {
+        wp.updates.updateLock = false;
+        wp.updates.queueChecker();
+    };
+
 
     /**
@@ -232 +213 @@
 
         var data = {
-            'action':      'install-plugin',
             '_ajax_nonce': wp.updates.ajaxNonce,
             'slug':        slug
         };
 
-        $.ajax( {
-            type:     'post',
-            url:      ajaxurl,
-            data:     data,
-            complete: wp.updates.installRequestComplete
-        } );
-    };
-
-
-    /**
-     * After an installation attempt has completed, deal with the response.
-     *
-     * @since 4.2.0
-     *
-     * @param {jqXHR} jqxhr The jQuery XMLHttpRequest for the request.
-     */
-    wp.updates.installRequestComplete = function( jqxhr ) {
-        wp.updates.updateLock = false;
-        if ( jqxhr.responseJSON && jqxhr.responseJSON.success ) {
-            wp.updates.installSuccess( jqxhr.responseJSON );
-        } else {
-            var alertText = wp.updates.l10n.installFailed;
-            if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.error ) {
-                 alertText += ': ' + jqxhr.responseJSON.data.error;
-            }
-            window.alert( alertText );
-            if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.slug ) {
-                wp.updates.installError( jqxhr.responseJSON );
-            }
-        }
-        /**
-         * Check the queue.
-         */
-        wp.updates.queueChecker();
+        wp.ajax.post( 'install-plugin', data )
+            .done( wp.updates.installSuccess )
+            .fail( wp.updates.installError )
+            .always( wp.updates.updateAlways );
     };
 
@@ -281 +231 @@
      */
     wp.updates.installSuccess = function( response ) {
-        var $message = $( '.plugin-card-' + response.data.slug ).find( '.install-now' );
+        var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
 
         $message.removeClass( 'updating-message' ).addClass( 'updated-message button-disabled' );
@@ -295 +245 @@
      */
     wp.updates.installError = function( response ) {
-        var $message = $( '.plugin-card-' + response.data.slug ).find( '.install-now' );
+        var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
 
         $message.removeClass( 'updating-message' );

trunk/src/wp-includes/script-loader.php

@@ -501 +501 @@
         ) );
 
-        $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery' ) );
+        $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util' ) );
         did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array(
             'ajax_nonce' => wp_create_nonce( 'updates' ),