Connect post preview customizer with post formats

westonruter · westonruter · commit ec73112d2472 · 2017-09-04T01:40:01.000-07:00
diff --git a/js/edit-post-preview-admin.js b/js/edit-post-preview-admin.js
@@ -38,7 +38,8 @@ var EditPostPreviewAdmin = (function( $ ) {
 			wasMobile,
 			parentId,
 			menuOrder,
-			request;
+			request,
+			postFormat;
 
 		event.preventDefault();
 
@@ -75,9 +76,17 @@ var EditPostPreviewAdmin = (function( $ ) {
 			ping_status: $( '#ping_status' ).prop( 'checked' ) ? 'open' : 'closed',
 			post_author: parseInt( $( '#post_author_override' ).val(), 10 )
 		};
-		postSettingId = 'post[' + postType + '][' + postId + ']';
+		postSettingId = 'post[' + postType + '][' + String( postId ) + ']';
 		settings[ postSettingId ] = postSettingValue;
 
+		postFormat = $( '#post-formats-select input[name=post_format]:checked' ).val();
+		if ( '0' === postFormat ) {
+			postFormat = 'standard';
+		}
+		if ( postFormat ) {
+			settings[ 'post_terms[' + postType + '][' + String( postId ) + '][post_format]' ] = postFormat;
+		}
+
 		// Allow plugins to inject additional settings to preview.
 		wp.customize.trigger( 'settings-from-edit-post-screen', settings );
 
@@ -86,15 +95,15 @@ var EditPostPreviewAdmin = (function( $ ) {
 			sessionStorage.setItem( 'previewedCustomizePostSettings[' + postId + ']', JSON.stringify( settings ) );
 			wp.customize.Loader.open( component.data.customize_url );
 			wp.customize.Loader.settings.browser.mobile = wasMobile;
-			component.bindChangesFromCustomizer( postSettingId, editor );
+			component.bindChangesFromCustomizer( postId, postType, editor );
 		} else {
 			$btn.addClass( 'disabled' );
 			component.previewButtonSpinner.addClass( 'is-active is-active-preview' );
 			request = wp.ajax.post( 'customize_posts_update_changeset', {
 				customize_posts_update_changeset_nonce: component.data.customize_posts_update_changeset_nonce,
 				previewed_post: component.data.previewed_post,
 				customize_url: component.data.customize_url,
-				input_data: postSettingValue
+				settings: JSON.stringify( settings )
 			} );
 
 			request.fail( function( resp ) {
@@ -108,7 +117,7 @@ var EditPostPreviewAdmin = (function( $ ) {
 			request.done( function( resp ) {
 				wp.customize.Loader.open( resp.customize_url );
 				wp.customize.Loader.settings.browser.mobile = wasMobile;
-				component.bindChangesFromCustomizer( postSettingId, editor );
+				component.bindChangesFromCustomizer( postId, postType, editor );
 			} );
 
 			request.always( function() {
@@ -121,13 +130,17 @@ var EditPostPreviewAdmin = (function( $ ) {
 	/**
 	 * Sync changes from the Customizer to the post input fields.
 	 *
-	 * @param {string} postSettingId post setting id.
-	 * @param {object} editor Tinymce object.
+	 * @param {int}    postId   - Post ID.
+	 * @param {string} postType - Post type.
+	 * @param {object} editor   - Tinymce object.
 	 * @return {void}
 	 */
-	component.bindChangesFromCustomizer = function( postSettingId, editor ) {
+	component.bindChangesFromCustomizer = function( postId, postType, editor ) {
+		var postSettingId, postFormatSettingId;
+		postSettingId = 'post[' + postType + '][' + String( postId ) + ']';
+		postFormatSettingId = 'post_terms[' + postType + '][' + String( postId ) + '][post_format]';
 		wp.customize.Loader.messenger.bind( 'customize-post-settings-data', function( data ) {
-			var settingParentId;
+			var settingParentId, postFormatRadioSelector;
 			if ( data[ postSettingId ] ) {
 				$( '#title' ).val( data[ postSettingId ].post_title ).trigger( 'change' );
 				if ( editor ) {
@@ -147,6 +160,14 @@ var EditPostPreviewAdmin = (function( $ ) {
 				$( '#new-post-slug' ).val( data[ postSettingId ].post_name );
 				$( '#editable-post-name, #editable-post-name-full' ).text( data[ postSettingId ].post_name );
 			}
+			if ( data[ postFormatSettingId ] ) {
+				if ( 'standard' === data[ postFormatSettingId ] ) {
+					postFormatRadioSelector = '#post-format-0';
+				} else {
+					postFormatRadioSelector = '#post-format-' + data[ postFormatSettingId ];
+				}
+				$( postFormatRadioSelector ).prop( 'checked', true ).trigger( 'change' );
+			}
 
 			// Let plugins handle updates.
 			wp.customize.trigger( 'settings-from-customizer', data );
diff --git a/js/edit-post-preview-customize.js b/js/edit-post-preview-customize.js
@@ -101,13 +101,11 @@ var EditPostPreviewCustomize = (function( $, api ) {
 		} );
 
 		// Start listening to changes to the post and postmeta.
-		api( 'post[' + component.data.previewed_post.post_type + '][' + component.data.previewed_post.ID + ']', function( setting ) {
-			setting.bind( function( data ) {
-				var settings = {};
-				settings[ setting.id ] = data;
-				component.sendSettingsToEditPostScreen( settings );
-			} );
-		} );
+		api.bind( 'change', function( setting ) {
+			var settings = {};
+			settings[ setting.id ] = setting.get();
+			component.sendSettingsToEditPostScreen( settings );
+		});
 
 		component.parentFrame.send( 'customize-post-preview-ready' );
 	};
diff --git a/php/class-edit-post-preview.php b/php/class-edit-post-preview.php
@@ -227,9 +227,14 @@ public function update_post_changeset() {
 		} elseif ( empty( $_POST['customize_url'] ) ) {
 			status_header( 400 );
 			wp_send_json_error( 'missing_customize_url' );
-		} elseif ( empty( $_POST['input_data'] ) || ! is_array( $_POST['input_data'] ) ) {
+		} elseif ( empty( $_POST['settings'] ) ) {
 			status_header( 400 );
-			wp_send_json_error( 'missing_input_data' );
+			wp_send_json_error( 'missing_settings' );
+		}
+		$setting_values = json_decode( wp_unslash( $_POST['settings'] ), true );
+		if ( ! is_array( $setting_values ) ) {
+			status_header( 400 );
+			wp_send_json_error( 'invalid_settings' );
 		}
 
 		$previewed_post_id = intval( wp_unslash( $_POST['previewed_post'] ) );
@@ -293,25 +298,21 @@ public function update_post_changeset() {
 		 */
 		$wp_customize_posts = $wp_customize->posts;
 
-		$settings = $wp_customize_posts->get_settings( array( $previewed_post_id ) );
-		$setting = array_shift( $settings );
+		if ( ! did_action( 'customize_register' ) ) {
+			remove_action( 'customize_register', array( $wp_customize, 'register_controls' ) );
+			$wp_customize->register_controls(); // Due to race condition with themes that set customize_register priority to 10.
+			do_action( 'customize_register', $wp_customize );
+		}
+		if ( ! did_action( 'customize_posts_register_meta' ) ) {
+			$wp_customize_posts->register_meta();
+		}
 
-		if ( ! $setting ) {
-			status_header( 404 );
-			wp_send_json_error( 'setting_not_found' );
-			return;
-		} elseif ( ! $setting->check_capabilities() ) {
-			status_header( 403 );
-			wp_send_json_error( 'changeset_already_published' );
-			return;
+		$wp_customize->add_dynamic_settings( array_keys( $setting_values ) );
+
+		foreach ( $setting_values as $setting_id => $setting_value ) {
+			$wp_customize->set_post_value( $setting_id, $setting_value );
 		}
-		$setting->preview();
 
-		// Note that save_changeset_post() will handle validation and sanitization.
-		$wp_customize->set_post_value( $setting->id, wp_array_slice_assoc(
-			array_merge( $setting->value(), wp_unslash( $_POST['input_data'] ) ),
-			array_keys( $setting->default )
-		) );
 		$response = $wp_customize->save_changeset_post();
 		if ( is_wp_error( $response ) ) {
 			wp_send_json_error( $response->get_error_code() );
diff --git a/php/class-wp-customize-post-terms-setting.php b/php/class-wp-customize-post-terms-setting.php
@@ -115,13 +115,11 @@ static function get_post_terms_setting_id( WP_Post $post, $taxonomy ) {
 	 * @return array Term IDs.
 	 */
 	public function value() {
-		$terms = wp_get_post_terms( $this->post_id, $this->taxonomy, array(
-			'fields' => 'ids',
-		) );
-		if ( is_wp_error( $terms ) ) {
+		$terms = get_the_terms( $this->post_id, $this->taxonomy );
+		if ( ! is_array( $terms ) ) {
 			return array();
 		}
-		return $terms;
+		return wp_list_pluck( $terms, 'term_id' );
 	}
 
 	/**
diff --git a/php/class-wp-customize-posts-preview.php b/php/class-wp-customize-posts-preview.php
@@ -1210,7 +1210,11 @@ public function filter_get_the_terms_to_preview( $terms, $post_id, $taxonomy ) {
 			return $terms;
 		}
 
-		/** @var WP_Customize_Post_Terms_Setting $previewed_setting */
+		/**
+		 * Previewed setting.
+		 *
+		 * @var WP_Customize_Post_Terms_Setting $previewed_setting
+		 */
 		$previewed_setting = $this->previewed_post_terms_settings[ $post_id ][ $taxonomy ];
 
 		$post_value = $previewed_setting->post_value( null );
diff --git a/php/class-wp-customize-posts.php b/php/class-wp-customize-posts.php
@@ -95,7 +95,8 @@ public function __construct( WP_Customize_Manager $manager ) {
 		add_action( 'customize_register', array( $this, 'ensure_static_front_page_constructs_registered' ), 11 );
 		add_action( 'customize_register', array( $this, 'register_constructs' ), 20 );
 		add_filter( 'map_meta_cap', array( $this, 'filter_map_meta_cap' ), 10, 4 );
-		add_action( 'init', array( $this, 'configure_builtins' ), 1 );
+		$this->configure_builtins();
+		add_action( 'init', array( $this, 'configure_builtins' ), 1 ); // Because built-ins get registered twice.
 		add_action( 'init', array( $this, 'register_meta' ), 100 );
 		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
 		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_customize_dynamic_setting_class' ), 5, 3 );
@@ -544,6 +545,9 @@ public function filter_customize_dynamic_setting_args( $args, $setting_id ) {
 			if ( empty( $taxonomy->show_in_customizer ) ) {
 				return $args;
 			}
+			if ( 'post_format' === $taxonomy->name && ! post_type_supports( $matches['post_type'], 'post-formats' ) ) { // @todo Remove from being hard-coded?
+				return $args;
+			}
 			if ( false === $args ) {
 				$args = array();
 			}
diff --git a/tests/php/test-ajax-class-wp-customize-posts.php b/tests/php/test-ajax-class-wp-customize-posts.php
@@ -486,12 +486,15 @@ public function test_update_post_changeset_successes() {
 			'ping_status' => 'closed',
 			'post_author' => $user_id,
 		);
+		$settings = array();
+		$setting_id = "post[post][$post_id]";
+		$settings[ $setting_id ] = $input_data;
 
 		$_POST = wp_slash( array(
 			'customize_posts_update_changeset_nonce' => wp_create_nonce( 'customize_posts_update_changeset' ),
 			'previewed_post' => $post_id,
 			'customize_url' => wp_customize_url(),
-			'input_data' => $input_data,
+			'settings' => wp_json_encode( $settings ),
 		) );
 		$this->make_ajax_call( 'customize_posts_update_changeset' );
 		$response = json_decode( $this->_last_response, true );
@@ -501,8 +504,7 @@ public function test_update_post_changeset_successes() {
 		$this->assertArrayHasKey( 'response', $response['data'] );
 		$this->assertArrayHasKey( 'setting_validities', $response['data']['response'] );
 
-		$setting_key = "post[post][$post_id]";
-		$this->assertTrue( $response['data']['response']['setting_validities'][ $setting_key ] );
+		$this->assertTrue( $response['data']['response']['setting_validities'][ $setting_id ] );
 
 		$customize_url_parts = parse_url( $response['data']['customize_url'] );
 		parse_str( $customize_url_parts['query'], $url_query );
@@ -524,7 +526,7 @@ public function test_update_post_changeset_successes() {
 		$settings_data = json_decode( $post->post_content, true );
 
 		foreach( $settings_data as $key => $data ) {
-			$this->assertEquals( $setting_key, $key );
+			$this->assertEquals( $setting_id, $key );
 			$this->assertArraySubset( $input_data, $data['value'] );
 		}
 	}
diff --git a/tests/php/test-class-wp-customize-posts.php b/tests/php/test-class-wp-customize-posts.php
@@ -748,11 +748,13 @@ public function test_get_settings() {
 		$this->assertEqualSets(
 			array(
 				WP_Customize_Post_Setting::get_post_setting_id( get_post( $published_post_id ) ),
+				WP_Customize_Post_Terms_Setting::get_post_terms_setting_id( get_post( $published_post_id ), 'post_format' ),
 				WP_Customize_Post_Setting::get_post_setting_id( get_post( $trashed_post_id ) ),
+				WP_Customize_Post_Terms_Setting::get_post_terms_setting_id( get_post( $trashed_post_id ), 'post_format' ),
 				WP_Customize_Post_Setting::get_post_setting_id( get_post( $draft_page_id ) ),
 				sprintf( 'nav_menu_item[%s]', $nav_menu_item_id ),
 				WP_Customize_Postmeta_Setting::get_post_meta_setting_id( get_post( $published_post_id ), 'baz' ),
-				WP_Customize_Postmeta_Setting::get_post_meta_setting_id( get_post( $trashed_post_id ), 'baz' )
+				WP_Customize_Postmeta_Setting::get_post_meta_setting_id( get_post( $trashed_post_id ), 'baz' ),
 			),
 			array_keys( $settings_params )
 		);
