Ticket #41894: 41894.3.diff

src/wp-admin/js/widgets.js

@@ -550 +550 @@
 
                                 if ( animate ) {
                                         order = 0;
-                                        widget.slideUp('fast', function(){
-                                                $(this).remove();
+                                        widget.slideUp( 'fast', function() {
+                                                $( this ).remove();
                                                 wpWidgets.saveOrder();
+                                                delete self.dirtyWidgets[ id ];
                                         });
                                 } else {
                                         widget.remove();
+                                        delete self.dirtyWidgets[ id ];
 
                                         if ( sidebarId === 'wp_inactive_widgets' ) {
                                                 $( '#inactive-widgets-control-remove' ).prop( 'disabled' , ! $( '#wp_inactive_widgets .widget' ).length );
@@ -590 +592 @@
         },
 
         removeInactiveWidgets : function() {
-                var $element = $( '.remove-inactive-widgets' ), a, data;
+                var $element = $( '.remove-inactive-widgets' ), self = this, a, data;
 
                 $( '.spinner', $element ).addClass( 'is-active' );
 
@@ -602 +604 @@
                 data = $.param( a );
 
                 $.post( ajaxurl, data, function() {
-                        $( '#wp_inactive_widgets .widget' ).remove();
+                        // Iterate over inactive widgets to remove them from dirtyWidgets before removing them from DOM
+                        $( '#wp_inactive_widgets .widget' ).each(function() {
+                                var $this = $( this );
+                                delete self.dirtyWidgets[ $( 'input.widget-id', $this ).val() ];
+                                $this.remove();
+                        });
                         $( '#inactive-widgets-control-remove' ).prop( 'disabled' , true );
                         $( '.spinner', $element ).removeClass( 'is-active' );
                 } );