Remove customize_changeset_status param only if auto save is triggered for editbox

mohdsayed · mohdsayed · commit 4b69f1f0db1e · 2017-02-24T20:50:23.000+05:30
diff --git a/js/customize-snapshots.js b/js/customize-snapshots.js
@@ -45,6 +45,8 @@
 				snapshot.data.uuid = snapshot.data.uuid || api.settings.changeset.uuid;
 				snapshot.data.title = snapshot.data.title || snapshot.data.uuid;
 
+				snapshot.editBoxAutoSaveTriggered = false;
+
 				if ( api.state.has( 'changesetStatus' ) && api.state( 'changesetStatus' ).get() ) {
 					api.state( 'snapshot-exists' ).set( true );
 				}
@@ -608,6 +610,7 @@
 					return;
 				}
 				snapshot.updatePending = true;
+				snapshot.editBoxAutoSaveTriggered = true;
 				snapshot.updateSnapshot( status ).done( function() {
 					snapshot.updatePending = snapshot.dirtyEditControlValues;
 					if ( ! snapshot.updatePending ) {
@@ -1078,12 +1081,12 @@
 		},
 
 		/**
-		 * Remove 'customize_changeset_status' if its already set; replace with customize_snapshots_create_revision param.
+		 * Remove 'customize_changeset_status' if it is being auto saved for edit box to avoid revisions.
 		 *
 		 * @return {void}
 		 */
 		prefilterAjax: function prefilterAjax() {
-			var removeParam, isSameStatus;
+			var snapshot = this, removeParam;
 
 			if ( ! api.state.has( 'changesetStatus' ) ) {
 				return;
@@ -1102,13 +1105,13 @@
 			};
 
 			$.ajaxPrefilter( function( options, originalOptions ) {
-				if ( ! originalOptions.data ) {
+				if ( ! originalOptions.data || ! snapshot.editBoxAutoSaveTriggered ) {
 					return;
 				}
-				isSameStatus = api.state( 'changesetStatus' ).get() === originalOptions.data.customize_changeset_status;
-				if ( 'customize_save' === originalOptions.data.action && isSameStatus && options.data ) {
+
+				if ( 'customize_save' === originalOptions.data.action && options.data ) {
 					options.data = removeParam( options.data, 'customize_changeset_status' );
-					options.data += '&customize_snapshots_create_revision=1';
+					snapshot.editBoxAutoSaveTriggered = false;
 				}
 			} );
 		}
diff --git a/php/class-customize-snapshot-manager.php b/php/class-customize-snapshot-manager.php
@@ -104,7 +104,6 @@ function hooks() {
 		add_action( 'admin_bar_menu', array( $this, 'remove_all_non_snapshot_admin_bar_links' ), 100000 );
 		add_action( 'wp_before_admin_bar_render', array( $this, 'print_admin_bar_styles' ) );
 		add_filter( 'removable_query_args', array( $this, 'filter_removable_query_args' ) );
-		add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 20, 3 );
 		add_action( 'save_post_customize_changeset', array( $this, 'create_initial_changeset_revision' ) );
 		add_filter( 'wp_insert_post_data', array( $this, 'prepare_snapshot_post_content_for_publish' ) );
 	}
@@ -357,24 +356,6 @@ public function create_initial_changeset_revision( $post_id ) {
 		}
 	}
 
-	/**
-	 * When a customize_save Ajax action is being made, ensure a revision is allowed if customize_snapshots_create_revision query param is present.
-	 *
-	 * @see \WP_Customize_Manager::_filter_revision_post_has_changed()
-	 *
-	 * @param bool     $post_has_changed Whether the post has changed.
-	 * @param \WP_Post $last_revision    The last revision post object.
-	 * @param \WP_Post $post             The post object.
-	 * @return bool Whether a revision should be made.
-	 */
-	public function _filter_revision_post_has_changed( $post_has_changed, $last_revision, $post ) {
-		unset( $last_revision );
-		if ( 'customize_changeset' === $post->post_type && ! empty( $_POST['customize_snapshots_create_revision'] ) ) {
-			$post_has_changed = true;
-		}
-		return $post_has_changed;
-	}
-
 	/**
 	 * Prepare snapshot post content for publishing.
 	 *
