WordPress 4.4

[autoinstalls/wordpress.git] / wp-admin / js / widgets.js

diff --git a/wp-admin/js/widgets.js b/wp-admin/js/widgets.js
index 000921a0be6b4567c7ec1a6177af5261c935669d..de64533bdfaa3e0f5ffd052d14d6ca1dc7e31d0e 100644 (file)
--- a/wp-admin/js/widgets.js
+++ b/wp-admin/js/widgets.js
@@ -80,6 +80,9 @@ wpWidgets = {
                                widget.removeClass( 'open' );
                                wpWidgets.close( widget );
                                e.preventDefault();
+                       } else if ( target.attr( 'id' ) === 'inactive-widgets-control-remove' ) {
+                               wpWidgets.removeInactiveWidgets();
+                               e.preventDefault();
                        }
                });
 
@@ -178,6 +181,7 @@ wpWidgets = {
                                        inside = ui.item.children('.widget-inside');
 
                                if ( inside.css('display') === 'block' ) {
+                                       ui.item.removeClass('open');
                                        inside.hide();
                                        $(this).sortable('refreshPositions');
                                }
@@ -296,7 +300,7 @@ wpWidgets = {
 
                                if ( ui.draggable.hasClass('ui-sortable-helper') ) {
                                        $('#removing-widget').show().children('span')
-                                       .html( ui.draggable.find('div.widget-title').children('h4').html() );
+                                       .html( ui.draggable.find( 'div.widget-title' ).children( 'h3' ).html() );
                                }
                        },
                        out: function(e,ui) {
@@ -309,7 +313,7 @@ wpWidgets = {
                // Area Chooser
                $( '#widgets-right .widgets-holder-wrap' ).each( function( index, element ) {
                        var $element = $( element ),
-                               name = $element.find( '.sidebar-name h3' ).text(),
+                               name = $element.find( '.sidebar-name h2' ).text(),
                                id = $element.find( '.widgets-sortables' ).attr( 'id' ),
                                li = $('<li tabindex="0">').text( $.trim( name ) );
 
@@ -386,6 +390,7 @@ wpWidgets = {
                });
 
                $.post( ajaxurl, data, function() {
+                       $( '#inactive-widgets-control-remove' ).prop( 'disabled' , ! $( '#wp_inactive_widgets .widget' ).length );
                        $( '.spinner' ).removeClass( 'is-active' );
                });
        },
@@ -430,6 +435,10 @@ wpWidgets = {
                                        });
                                } else {
                                        widget.remove();
+
+                                       if ( sidebarId === 'wp_inactive_widgets' ) {
+                                               $( '#inactive-widgets-control-remove' ).prop( 'disabled' , ! $( '#wp_inactive_widgets .widget' ).length );
+                                       }
                                }
                        } else {
                                $( '.spinner' ).removeClass( 'is-active' );
@@ -437,14 +446,38 @@ wpWidgets = {
                                        $( 'div.widget-content', widget ).html( r );
                                        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' );
+               } );
+       },
+
        appendTitle : function(widget) {
                var title = $('input[id*="-title"]', widget).val() || '';