Merge pull request #125 from xwp/return-url-fix

Fix return url in customizer.
xwp · Mar 10, 2017 · c7b9124 · c7b9124
2 parents 7f02238 + 87e7e74
commit c7b9124
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/js/compat/customize-snapshots.js b/js/compat/customize-snapshots.js
@@ -48,6 +48,8 @@
 					snapshot.previewLink.attr( 'target', snapshot.data.uuid );
 				}
 
+				snapshot.removeParamFromClose( 'customize_snapshot_uuid' );
+
 				api.state( 'snapshot-exists' ).set( false );
 
 				// Replace the history state with an updated Customizer URL that does not include the Snapshot UUID.

diff --git a/js/customize-snapshots.js b/js/customize-snapshots.js
@@ -232,6 +232,10 @@
 				snapshot.snapshotExpandButton.toggle( ! isPublishStatus );
 				snapshot.previewLink.toggle( ! isPublishStatus );
 
+				if ( isPublishStatus ) {
+					snapshot.removeParamFromClose( 'customize_changeset_uuid' );
+				}
+
 				snapshot.statusButton.updateButtonText( 'alt-text' );
 
 				// Trigger an event for plugins to use.
@@ -1146,6 +1150,31 @@
 					snapshot.editBoxAutoSaveTriggered = false;
 				}
 			} );
+		},
+
+		/**
+		 * Remove a param from close button link.
+		 *
+		 * @param {string} targetParam param.
+		 * @return {void}.
+		 */
+		removeParamFromClose: function removeParamFromClose( targetParam ) {
+			var closeButton, queryString, updatedParams;
+			closeButton = $( '.customize-controls-close' );
+			queryString = closeButton.prop( 'search' ).substr( 1 );
+
+			if ( ! queryString.length ) {
+				return;
+			}
+
+			updatedParams = _.filter(
+				queryString.split( '&' ),
+				function( paramPair ) {
+					return 0 !== paramPair.indexOf( targetParam + '=' );
+				}
+			);
+
+			closeButton.prop( 'search', updatedParams.join( '&' ) );
 		}
 	} );
 

diff --git a/php/class-customize-snapshot-manager.php b/php/class-customize-snapshot-manager.php
@@ -221,6 +221,8 @@ public function is_theme_active() {
 	 */
 	public function add_snapshot_uuid_to_return_url() {
 		$should_add_snapshot_uuid = (
+			isset( $_GET[ $this->get_front_uuid_param() ] )
+			&&
 			$this->current_snapshot_uuid
 			&&
 			$this->is_theme_active()

diff --git a/tests/php/test-class-customize-snapshot-manager.php b/tests/php/test-class-customize-snapshot-manager.php
@@ -387,7 +387,7 @@ public function test_is_theme_active() {
 	public function test_add_snapshot_uuid_to_return_url() {
 		global $wp_version;
 		if ( version_compare( $wp_version, '4.4-beta', '>=' ) ) {
-			$_REQUEST[ $this->front_param ] = self::UUID;
+			$_GET[ $this->front_param ] = $_REQUEST[ $this->front_param ] = self::UUID;
 			$manager = $this->get_snapshot_manager_instance( $this->plugin );
 			$manager->init();
 			$manager->ensure_customize_manager();