Changeset 35317

Timestamp:

10/21/2015 05:22:52 AM (9 years ago)

Author:

azaozz

Message:

Widgets: add a button to delete all inactive widgets simultaneously for better UX.

Props cdog.
Fixes #19159.

Location:

trunk/src/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• css/widgets.css (modified) (2 diffs)
• includes/ajax-actions.php (modified) (1 diff)
• js/widgets.js (modified) (4 diffs)
• widgets.php (modified) (2 diffs)

trunk/src/wp-admin/admin-ajax.php

@@ -57 +57 @@
     'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
     'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
-    'save-widget', 'set-post-thumbnail', 'date_format', 'time_format',
+    'save-widget', 'delete-inactive-widgets', 'set-post-thumbnail', 'date_format', 'time_format',
     'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
     'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',

trunk/src/wp-admin/css/widgets.css

@@ -273 +273 @@
 }
 
-.sidebar-name .spinner {
+.sidebar-name .spinner,
+.remove-inactive-widgets .spinner {
     float: none;
     position: relative;
@@ -349 +350 @@
 .js .widgets-holder-wrap.closed .widget,
 .js .widgets-holder-wrap.closed .sidebar-description,
+.js .widgets-holder-wrap.closed .remove-inactive-widgets,
 .js .closed br.clear {
     display: none;

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1935 +1935 @@
 
 /**
+ * Ajax handler for removing inactive widgets.
+ *
+ * @since 4.4.0
+ */
+function wp_ajax_delete_inactive_widgets() {
+    check_ajax_referer( 'remove-inactive-widgets', 'removeinactivewidgets' );
+
+    if ( ! current_user_can( 'edit_theme_options' ) ) {
+        wp_die( -1 );
+    }
+
+    unset( $_POST['removeinactivewidgets'], $_POST['action'] );
+
+    do_action( 'load-widgets.php' );
+    do_action( 'widgets.php' );
+    do_action( 'sidebar_admin_setup' );
+
+    $sidebars_widgets = wp_get_sidebars_widgets();
+
+    foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
+        $pieces = explode( '-', $widget_id );
+        $multi_number = array_pop( $pieces );
+        $id_base = implode( '-', $pieces );
+        $widget = get_option( 'widget_' . $id_base );
+        unset( $widget[$multi_number] );
+        update_option( 'widget_' . $id_base, $widget );
+        unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+    }
+
+    wp_set_sidebars_widgets( $sidebars_widgets );
+
+    wp_die();
+}
+
+/**
  * Ajax handler for uploading attachments
  *

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

@@ -80 +80 @@
                 widget.removeClass( 'open' );
                 wpWidgets.close( widget );
+                e.preventDefault();
+            } else if ( target.attr( 'id' ) === 'inactive-widgets-control-remove' ) {
+                wpWidgets.removeInactiveWidgets();
                 e.preventDefault();
             }
@@ -388 +391 @@
 
         $.post( ajaxurl, data, function() {
+            $( '#inactive-widgets-control-remove' ).prop( 'disabled' , ! $( '#wp_inactive_widgets .widget' ).length );
             $( '.spinner' ).removeClass( 'is-active' );
         });
@@ -432 +436 @@
                 } else {
                     widget.remove();
+
+                    if ( sidebarId === 'wp_inactive_widgets' ) {
+                        $( '#inactive-widgets-control-remove' ).prop( 'disabled' , ! $( '#wp_inactive_widgets .widget' ).length );
+                    }
                 }
             } else {
@@ -439 +447 @@
                     wpWidgets.appendTitle( widget );
                     $document.trigger( 'widget-updated', [ widget ] );
-                }
-            }
+
+                    if ( sidebarId === 'wp_inactive_widgets' ) {
+                        $( '#inactive-widgets-control-remove' ).prop( 'disabled' , ! $( '#wp_inactive_widgets .widget' ).length );
+                    }
+                }
+            }
+
             if ( order ) {
                 wpWidgets.saveOrder();
             }
         });
+    },
+
+    removeInactiveWidgets : function() {
+        var $element = $( '.remove-inactive-widgets' ), a, data;
+
+        $( '.spinner', $element ).addClass( 'is-active' );
+
+        a = {
+            action : 'delete-inactive-widgets',
+            removeinactivewidgets : $( '#_wpnonce_remove_inactive_widgets' ).val()
+        };
+
+        data = $.param( a );
+
+        $.post( ajaxurl, data, function() {
+            $( '#wp_inactive_widgets .widget' ).remove();
+            $( '#inactive-widgets-control-remove' ).prop( 'disabled' , true );
+            $( '.spinner', $element ).removeClass( 'is-active' );
+        } );
     },
 

trunk/src/wp-admin/widgets.php

@@ -195 +195 @@
 }
 
+// Remove inactive widgets without js
+if ( isset( $_POST['removeinactivewidgets'] ) ) {
+    check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );
+
+    if ( $_POST['removeinactivewidgets'] ) {
+        foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
+            $pieces = explode( '-', $widget_id );
+            $multi_number = array_pop( $pieces );
+            $id_base = implode( '-', $pieces );
+            $widget = get_option( 'widget_' . $id_base );
+            unset( $widget[$multi_number] );
+            update_option( 'widget_' . $id_base, $widget );
+            unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+        }
+
+        wp_set_sidebars_widgets( $sidebars_widgets );
+    }
+
+    wp_redirect( admin_url( 'widgets.php?message=0' ) );
+    exit;
+}
+
 // Output the widget form without js
 if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
@@ -389 +411 @@
             <div class="widget-holder inactive">
                 <?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
-                <div class="clear"></div>
+                <div class="remove-inactive-widgets">
+                    <form action="" method="post">
+                        <p>
+                            <?php
+                            $attributes = array( 'id' => 'inactive-widgets-control-remove' );
+
+                            if ( empty($sidebars_widgets['wp_inactive_widgets']) ) {
+                                $attributes['disabled'] = '';
+                            }
+
+                            submit_button( __( 'Clear Inactive Widgets' ), 'delete', 'removeinactivewidgets', false, $attributes );
+                            ?>
+                            <span class="spinner">
+                        </p>
+                        <?php wp_nonce_field( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); ?>
+                    </form>
+                </div>
             </div>
+            <p class="description"><?php _e( 'This will clear all items from the inactive widgets list. You will not be able to restore any customizations.' ); ?></p>
         </div>
         <?php