Changeset 38227

Timestamp:

08/09/2016 10:38:28 AM (8 years ago)

Author:

ocean90

Message:

Updates: Add visual feedback when deleting themes/plugins.

This corrects the selector for the delete link in wp.updates.deletePlugin() so the text can be changed to 'Deleting…'. wp.updates.deleteTheme() already worked on wp-admin/themes.php but not on wp-admin/network/themes.php because the network screen is similar to the plugins list table, this is now fixed too.
The credential-modal-cancel handler has been updated to support canceled delete jobs.

Props swissspidy.
Props jorbin for review.
Fixes #37603.

File:

• trunk/src/wp-admin/js/updates.js (modified) (5 diffs)

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

@@ -717 +717 @@
      */
     wp.updates.deletePlugin = function( args ) {
-        var $message = $( '[data-plugin="' + args.plugin + '"]' ).find( '.update-message p' );
+        var $link = $( '[data-plugin="' + args.plugin + '"]' ).find( '.row-actions a.delete' );
 
         args = _.extend( {
@@ -724 +724 @@
         }, args );
 
-        if ( $message.html() !== wp.updates.l10n.updating ) {
-            $message.data( 'originaltext', $message.html() );
+        if ( $link.html() !== wp.updates.l10n.deleting ) {
+            $link
+                .data( 'originaltext', $link.html() )
+                .text( wp.updates.l10n.deleting );
         }
 
@@ -1169 +1171 @@
      */
     wp.updates.deleteTheme = function( args ) {
-        var $button = $( '.theme-actions .delete-theme' );
+        var $button;
+
+        if ( 'themes' === pagenow ) {
+            $button = $( '.theme-actions .delete-theme' );
+        } else if ( 'themes-network' === pagenow ) {
+            $button = $( '[data-slug="' + args.slug + '"]' ).find( '.row-actions a.delete' );
+        }
 
         args = _.extend( {
@@ -1176 +1184 @@
         }, args );
 
-        if ( $button.html() !== wp.updates.l10n.deleting ) {
-            $button.data( 'originaltext', $button.html() );
-        }
-
-        $button.text( wp.updates.l10n.deleting );
+        if ( $button && $button.html() !== wp.updates.l10n.deleting ) {
+            $button
+                .data( 'originaltext', $button.html() )
+                .text( wp.updates.l10n.deleting );
+        }
+
         wp.a11y.speak( wp.updates.l10n.deleting, 'polite' );
 
@@ -1711 +1720 @@
                 $updatingMessage.removeClass( 'updating-message' );
             } else if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-                $message = $( 'tr[data-plugin="' + job.data.plugin + '"]' ).find( '.update-message' );
+                if ( 'update-plugin' === job.action ) {
+                    $message = $( 'tr[data-plugin="' + job.data.plugin + '"]' ).find( '.update-message' );
+                } else if ( 'delete-plugin' === job.action ) {
+                    $message = $( '[data-plugin="' + job.data.plugin + '"]' ).find( '.row-actions a.delete' );
+                }
+            } else if ( 'themes' === pagenow || 'themes-network' === pagenow ) {
+                if ( 'update-theme' === job.action ) {
+                    $message = $( '[data-slug="' + job.data.slug + '"]' ).find( '.update-message' );
+                } else if ( 'delete-theme' === job.action && 'themes-network' === pagenow ) {
+                    $message = $( '[data-slug="' + job.data.slug + '"]' ).find( '.row-actions a.delete' );
+                } else if ( 'delete-theme' === job.action && 'themes' === pagenow ) {
+                    $message = $( '.theme-actions .delete-theme' );
+                }
             } else {
                 $message = $updatingMessage;