WIP: Add state query vars while saving

mohdsayed · mohdsayed · commit 0b5ef52b7ef8 · 2017-11-02T17:44:02.000+05:30
diff --git a/js/customize-snapshots.js b/js/customize-snapshots.js
@@ -32,6 +32,7 @@
 				snapshot.data.title = snapshot.data.title || snapshot.data.uuid;
 				api.state.create( 'changesetTitle', snapshot.data.title );
 
+				snapshot.extendPreviewerQuery();
 				api.section( 'publish_settings', snapshot.addTitleControl );
 				api.trigger( 'snapshots-ready', snapshot );
 			} );
@@ -44,7 +45,7 @@
 		 * @return {void}
 		 */
 		addTitleControl: function( section ) {
-		    var snapshot = this, control, toggleControl, originalQuery;
+		    var snapshot = this, control, toggleControl;
 
 			control = new api.Control( 'changeset_title', {
 				type: 'text',
@@ -67,14 +68,6 @@
 			toggleControl( api.state( 'selectedChangesetStatus' ).get() );
 			api.state( 'selectedChangesetStatus' ).bind( toggleControl );
 
-			originalQuery = api.previewer.query;
-
-			api.previewer.query = function() {
-				var retval = originalQuery.apply( this, arguments );
-				retval.customize_changeset_title = api.state( 'changesetTitle' );
-				return retval;
-			};
-
 			api.state( 'changesetTitle' ).bind( function() {
 				api.state( 'saved' ).set( false );
 			} );
@@ -85,6 +78,63 @@
 				}
 				return undefined;
 			} );
+		},
+
+		/**
+		 * Amend the preview query so we can update the snapshot during `changeset_save`.
+		 *
+		 * @return {void}
+		 */
+		extendPreviewerQuery: function extendPreviewerQuery() {
+			var snapshot = this, originalQuery = api.previewer.query;
+
+			api.previewer.query = function() {
+				var retval = originalQuery.apply( this, arguments );
+
+				if ( api.state( 'selectedChangesetStatus' ) && 'publish' !== api.state( 'selectedChangesetStatus' ) ) {
+					retval.customizer_state_query_vars = JSON.stringify( snapshot.getStateQueryVars() );
+					retval.customize_changeset_title = api.state( 'changesetTitle' );
+				}
+
+				return retval;
+			};
+		},
+
+		/**
+		 * Get state query vars.
+		 * @todo Reuse method in compat mode?
+		 *
+		 * @return {{}} Query vars for scroll, device, url, and autofocus.
+		 */
+		getStateQueryVars: function() {
+			var snapshot = this, queryVars;
+
+			queryVars = {
+				'autofocus[control]': null,
+				'autofocus[section]': null,
+				'autofocus[panel]': null
+			};
+
+			queryVars.scroll = parseInt( api.previewer.scroll, 10 ) || 0;
+			queryVars.device = api.previewedDevice.get();
+			queryVars.url = api.previewer.previewUrl.get();
+
+			if ( ! api.state( 'activated' ).get() || snapshot.isNotSavedPreviewingTheme ) {
+				queryVars.previewing_theme = true;
+			}
+
+			_.find( [ 'control', 'section', 'panel' ], function( constructType ) {
+				var found = false;
+				api[ constructType ].each( function( construct ) { // @todo Core needs to support more Backbone methods on wp.customize.Values().
+					if ( ! found && construct.expanded && construct.expanded.get() ) {
+						queryVars[ 'autofocus[' + constructType + ']' ] = construct.id;
+						found = true;
+					}
+				} );
+				return found;
+			} );
+
+			return queryVars;
 		}
 	} );
 
