Changeset 42114

Timestamp:

11/03/2017 05:36:27 PM (8 years ago)

Author:

westonruter

Message:

Customize: Ensure changeset_uuid param for autosave auto-draft gets stripped from location after previewing theme switch when not in branching mode.

Amends [41597].
See #39896.
Fixes #42415.

File:

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

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

@@ -8249 +8249 @@
         // Set up initial notifications.
         (function() {
+            var removedQueryParams = [];
 
             /**
@@ -8345 +8346 @@
             if ( api.settings.changeset.autosaved ) {
                 api.state( 'saved' ).set( false );
-                stripParamsFromLocation( [ 'customize_autosaved' ] ); // Remove param when restoring autosave revision.
-            } else if ( ! api.settings.changeset.branching && 'auto-draft' === api.settings.changeset.status ) {
-                stripParamsFromLocation( [ 'changeset_uuid' ] ); // Remove UUID when restoring autosave auto-draft.
+                removedQueryParams.push( 'customize_autosaved' );
+            }
+            if ( ! api.settings.changeset.branching && ( ! api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ) ) {
+                removedQueryParams.push( 'changeset_uuid' ); // Remove UUID when restoring autosave auto-draft.
+            }
+            if ( removedQueryParams.length > 0 ) {
+                stripParamsFromLocation( removedQueryParams );
             }
             if ( api.settings.changeset.latestAutoDraftUuid || api.settings.changeset.hasAutosaveRevision ) {