Add initial working post format selector

[ci skip]

Author: westonruter

js/customize-post-section.js

@@ -282,7 +282,7 @@
 				section.addStatusControl();
 				section.addDateControl();
 			}
-			if ( postTypeObj.supports['post-formats'] ) {
+			if ( api.Posts.data.themeSupports['post-formats'] && postTypeObj.supports['post-formats'] ) {
 				section.addPostFormatControl();
 			}
 			if ( postTypeObj.supports['page-attributes'] || postTypeObj.supports.parent ) {
@@ -639,27 +639,33 @@
 		/**
 		 * Add post format control.
 		 *
-		 * @todo Move this into a separate file.
+		 * @todo Move this into a separate file/component like Page Template and Featured Image.
+		 *
+		 * @see post_format_meta_box() in PHP.
 		 *
 		 * @returns {wp.customize.Control} Added control.
 		 */
 		addPostFormatControl: function addPostFormatControl() {
-			var section = this, control, setting = api( section.id ), controlId, settingId, params, postTypeObj, supports;
+			var section = this, control, settingId, setting, controlId, postTypeObj, postFormats;
 
-			// @todo Get whether or not the theme has indicated support for post formats.
-			supports = api.Posts.data.postTypes[ section.params.post_type ].supports;
+			postTypeObj = api.Posts.data.postTypes[ section.params.post_type ];
+			if ( ! api.Posts.data.themeSupports['post-formats'] || ! postTypeObj.supports['post-formats'] ) {
+				return null;
+			}
 
-			if ( ! supports['post-formats'] || 'page' !== section.params.post_type ) {
+			settingId = 'post_terms[' + section.params.post_type + '][' + String( section.params.post_id ) + '][post_format]';
+			setting = api( settingId );
+			if ( ! setting ) {
 				return null;
 			}
 
+			// Add in the current one if it isn't there yet, in case the current theme doesn't support it
+			postFormats = _.uniq(
+				[ 'standard' ].concat( api.Posts.data.themeSupports['post-formats'] ).concat( [ setting.get() ] )
+			);
 
-			return;
-			postTypeObj = api.Posts.data.postTypes[ section.params.post_type ];
-			settingId = 'postterms[' + section.params.post_type + '][' + String( section.params.post_id ) + '][post_format]';
 			controlId = section.id + '[post_format]';
-
-			control = new api.controlConstructor.dynamic( section.id + '[post_format]', {
+			control = new api.controlConstructor.dynamic( controlId, {
 				params: {
 					section: section.id,
 					priority: 65,
@@ -669,7 +675,15 @@
 						'default': setting.id
 					},
 					field_type: 'select',
-					choices: postTypeObj['post-formats']
+					input_attrs: {
+						'data-customize-setting-link': settingId // @todo The need for this needs to be eliminated in core.
+					},
+					choices: _.map( postFormats, function( postFormat ) {
+						return {
+							text: api.Posts.data.l10n.postFormatStrings[ postFormat ] || postFormat,
+							value: postFormat
+						};
+					} )
 				}
 			} );
 

js/customize-posts.js

@@ -73,30 +73,36 @@
 	component.parseSettingId = function parseSettingId( settingId ) {
 		var parsed = {}, idParts;
 		idParts = settingId.replace( /]/g, '' ).split( '[' );
-		if ( 'post' !== idParts[0] && 'postmeta' !== idParts[0] ) {
-			return null;
-		}
-		parsed.settingType = idParts[0];
-		if ( 'post' === parsed.settingType && 3 !== idParts.length || 'postmeta' === parsed.settingType && 4 !== idParts.length ) {
-			return null;
-		}
+		parsed.settingType = idParts.shift();
 
-		parsed.postType = idParts[1];
+		parsed.postType = idParts.shift();
 		if ( ! parsed.postType ) {
 			return null;
 		}
 
-		parsed.postId = parseInt( idParts[2], 10 );
-		if ( isNaN( parsed.postId ) || parsed.postId <= 0 ) {
+		parsed.postId = parseInt( idParts.shift(), 10 );
+		if ( ! parsed.postId || isNaN( parsed.postId ) || parsed.postId <= 0 ) {
 			return null;
 		}
 
 		if ( 'postmeta' === parsed.settingType ) {
-			parsed.metaKey = idParts[3];
+			parsed.metaKey = idParts.shift();
 			if ( ! parsed.metaKey ) {
 				return null;
 			}
+		} else if ( 'post_terms' === parsed.settingType ) {
+			parsed.taxonomy = idParts.shift();
+			if ( ! parsed.taxonomy ) {
+				return null;
+			}
+		} else if ( 'post' !== parsed.settingType ) {
+			return null;
 		}
+
+		if ( 0 !== idParts.length ) {
+			return null; // Too many ID parts.
+		}
+
 		return parsed;
 	};
 

php/class-wp-customize-post-format-setting.php

@@ -60,16 +60,18 @@ public function sanitize( $format ) {
 		$value = array();
 		if ( 'standard' !== $format ) {
 			$slug = 'post-format-' . $format;
-			$term = get_term_by( 'slug', $format, $this->taxonomy );
+			$term = get_term_by( 'slug', $slug, $this->taxonomy );
 
 			// Make sure the post format term exists.
-			if ( ! $term ) {
+			if ( $term instanceof WP_Term ) {
+				$value[] = $term->term_id;
+			} else {
 				$term = wp_insert_term( $slug, $this->taxonomy );
 				if ( is_wp_error( $term ) ) {
 					return $has_setting_validation ? $term : null;
 				}
+				$value[] = $term['term_id'];
 			}
-			$value[] = $term->term_id;
 		}
 
 		$value = parent::sanitize( $value );

php/class-wp-customize-posts.php

@@ -95,6 +95,7 @@ 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 );
 		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 );
@@ -229,6 +230,7 @@ public function configure_builtins() {
 		if ( post_type_exists( 'attachment' ) && ! isset( $wp_post_types['attachment']->show_in_customizer ) ) {
 			$wp_post_types['attachment']->show_in_customizer = false;
 		}
+
 		if ( taxonomy_exists( 'post_format' ) ) {
 			if ( ! isset( $wp_taxonomies['post_format']->show_in_customizer ) ) {
 				$wp_taxonomies['post_format']->show_in_customizer = true;
@@ -448,7 +450,6 @@ public function register_constructs() {
 		$panel_priority = 900; // Before widgets.
 
 		// Note that this does not include nav_menu_item.
-		$this->configure_builtins();
 		foreach ( $this->get_post_types() as $post_type_object ) {
 			if ( empty( $post_type_object->show_in_customizer ) ) {
 				continue;
@@ -638,7 +639,7 @@ public function register_post_type_meta_settings( $post ) {
 	 */
 	public function register_post_terms_settings( $post ) {
 		$setting_ids = array();
-		foreach ( get_taxonomies() as $taxonomy ) {
+		foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
 			if ( empty( $taxonomy->show_in_customizer ) ) {
 				continue;
 			}
@@ -853,7 +854,16 @@ public function enqueue_scripts() {
 			);
 		}
 
+		$theme_supports = array();
+		if ( current_theme_supports( 'post-formats' ) ) {
+			$theme_support = get_theme_support( 'post-formats' );
+			if ( isset( $theme_support[0] ) && is_array( $theme_support[0] ) ) {
+				$theme_supports['post-formats'] = $theme_support[0];
+			}
+		}
+
 		$exports = array(
+			'themeSupports' => $theme_supports,
 			'postTypes' => $post_types,
 			'postStatusChoices' => $this->get_post_status_choices(),
 			'authorChoices' => $this->get_author_choices(), // @todo Use Ajax to fetch this data or Customize Object Selector (once it supports users).
@@ -900,6 +910,7 @@ public function enqueue_scripts() {
 
 				/* translators: %s post type */
 				'jumpToPostPlaceholder' => __( 'Jump to %s', 'customize-posts' ),
+				'postFormatStrings' => get_post_format_strings(),
 			),
 		);