Changeset 39060

Timestamp:

10/31/2016 04:41:06 PM (8 years ago)

Author:

westonruter

Message:

Customize: Ensure state query params persist in preview through calls to history.pushState() & history.replaceState().

Allow history to be manipulated before DOM ready by sourcing state params from the current URL instead of from the wp.customize.settings object, since they will be the same anyway. This fixes a JS error since wp.customize.settings is not defined before DOM ready.

Amends [38810].
See #30937.
Fixes #38592.

File:

• trunk/src/wp-includes/js/customize-preview.js (modified) (1 diff)

trunk/src/wp-includes/js/customize-preview.js

@@ -30 +30 @@
          */
         injectUrlWithState = function( url ) {
-            var urlParser, queryParams;
+            var urlParser, oldQueryParams, newQueryParams;
             urlParser = document.createElement( 'a' );
             urlParser.href = url;
-            queryParams = api.utils.parseQueryString( urlParser.search.substr( 1 ) );
-
-            queryParams.customize_changeset_uuid = api.settings.changeset.uuid;
-            if ( ! api.settings.theme.active ) {
-                queryParams.customize_theme = api.settings.theme.stylesheet;
-            }
-            if ( api.settings.theme.channel ) {
-                queryParams.customize_messenger_channel = api.settings.channel;
-            }
-            urlParser.search = $.param( queryParams );
-            return url;
+            oldQueryParams = api.utils.parseQueryString( location.search.substr( 1 ) );
+            newQueryParams = api.utils.parseQueryString( urlParser.search.substr( 1 ) );
+
+            newQueryParams.customize_changeset_uuid = oldQueryParams.customize_changeset_uuid;
+            if ( oldQueryParams.customize_theme ) {
+                newQueryParams.customize_theme = oldQueryParams.customize_theme;
+            }
+            if ( oldQueryParams.customize_messenger_channel ) {
+                newQueryParams.customize_messenger_channel = oldQueryParams.customize_messenger_channel;
+            }
+            urlParser.search = $.param( newQueryParams );
+            return urlParser.href;
         };