Changeset 42144 for trunk

Timestamp:

11/10/2017 09:43:32 PM (9 years ago)

Author:

westonruter

Message:

Customize: Ensure autosave revision is dismissed immediately after implicit restoration notice dismissal as done with explicit notice dismissal.

Fixes issue where a drafted/scheduled changeset could inadvertently re-use the previous autosave revision in the preview while a user expects it to have been dismissed.

See #39896, [41597].
Fixes #42502 for trunk.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (4 diffs)

trunk/src/wp-admin/js/customize-controls.js

@@ -8249 +8249 @@
                 // Set up initial notifications.
                 (function() {
-                        var removedQueryParams = [];
+                        var removedQueryParams = [], autosaveDismissed = false;
 
                         /**
@@ -8296 +8296 @@
 
                         /**
+                         * Dismiss autosave.
+                         *
+                         * @returns {void}
+                         */
+                        function dismissAutosave() {
+                                if ( autosaveDismissed ) {
+                                        return;
+                                }
+                                wp.ajax.post( 'customize_dismiss_autosave_or_lock', {
+                                        wp_customize: 'on',
+                                        customize_theme: api.settings.theme.stylesheet,
+                                        customize_changeset_uuid: api.settings.changeset.uuid,
+                                        nonce: api.settings.nonce.dismiss_autosave_or_lock,
+                                        dismiss_autosave: true
+                                } );
+                                autosaveDismissed = true;
+                        }
+
+                        /**
                          * Add notification regarding the availability of an autosave to restore.
                          *
@@ -8320 +8339 @@
 
                                                 // Handle dismissal of notice.
-                                                li.find( '.notice-dismiss' ).on( 'click', function() {
-                                                        wp.ajax.post( 'customize_dismiss_autosave_or_lock', {
-                                                                wp_customize: 'on',
-                                                                customize_theme: api.settings.theme.stylesheet,
-                                                                customize_changeset_uuid: api.settings.changeset.uuid,
-                                                                nonce: api.settings.nonce.dismiss_autosave_or_lock,
-                                                                dismiss_autosave: true
-                                                        } );
-                                                } );
+                                                li.find( '.notice-dismiss' ).on( 'click', dismissAutosave );
 
                                                 return li;
@@ -8336 +8347 @@
                                 // Remove the notification once the user starts making changes.
                                 onStateChange = function() {
+                                        dismissAutosave();
                                         api.notifications.remove( code );
                                         api.unbind( 'change', onStateChange );