Changeset 41814

Timestamp:

10/10/2017 08:38:22 PM (7 years ago)

Author:

westonruter

Message:

Widgets: Clear dirty flag on widgets admin screen when widget is deleted to prevent irrelevant confirmation prompt when leaving.

Props hazimayesh, felipeelia.
Amends [41352], [41813].
See #23120, #42127.
Fixes #41894.

File:

• trunk/src/wp-admin/js/widgets.js (modified) (3 diffs)

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

@@ -551 +551 @@
                 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' ) {
@@ -591 +593 @@
 
     removeInactiveWidgets : function() {
-        var $element = $( '.remove-inactive-widgets' ), a, data;
+        var $element = $( '.remove-inactive-widgets' ), self = this, a, data;
 
         $( '.spinner', $element ).addClass( 'is-active' );
@@ -603 +605 @@
 
         $.post( ajaxurl, data, function() {
-            $( '#wp_inactive_widgets .widget' ).remove();
-            $( '#inactive-widgets-control-remove' ).prop( 'disabled' , true );
+            $( '#wp_inactive_widgets .widget' ).each(function() {
+                var $widget = $( this );
+                delete self.dirtyWidgets[ $widget.find( 'input.widget-id' ).val() ];
+                $widget.remove();
+            });
+            $( '#inactive-widgets-control-remove' ).prop( 'disabled', true );
             $( '.spinner', $element ).removeClass( 'is-active' );
         } );