Merge pull request #305 from xwp/develop

westonruter · web-flow · commit 6cbefa362859 · 2016-10-03T22:46:10.000-07:00
Release 0.8.2
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "xwp/wp-customize-posts",
 	"description": "Manage posts and postmeta via the Customizer.",
-	"version": "0.8.1",
+	"version": "0.8.2",
 	"type": "wordpress-plugin",
 	"keywords": [ "customizer", "customize", "posts", "postmeta", "preview", "featured-image", "page-template" ],
 	"homepage": "https://github.com/xwp/wp-customize-posts/",
diff --git a/customize-posts.php b/customize-posts.php
@@ -3,7 +3,7 @@
  * Plugin Name: Customize Posts
  * Description: Manage posts and postmeta via the Customizer. Works best in conjunction with the <a href="https://wordpress.org/plugins/customize-setting-validation/">Customize Setting Validation</a> plugin.
  * Plugin URI: https://github.com/xwp/wp-customize-posts/
- * Version: 0.8.1
+ * Version: 0.8.2
  * Author: XWP
  * Author URI: https://make.xwp.co/
  * License: GPLv2+
diff --git a/js/customize-post-date-control.js b/js/customize-post-date-control.js
@@ -183,8 +183,8 @@
 				return;
 			}
 
-			remainingTime = ( new Date( control.setting.get().post_date ) ).valueOf();
-			remainingTime -= ( new Date( api.Posts.getCurrentTime() ) ).valueOf();
+			remainingTime = api.Posts.parsePostDate( control.setting.get().post_date ).valueOf();
+			remainingTime -= api.Posts.parsePostDate( api.Posts.getCurrentTime() ).valueOf();
 			remainingTime = Math.ceil( remainingTime / 1000 );
 			if ( remainingTime > 0 ) {
 				control.scheduledCountdownContainer.text( control.scheduledCountdownTemplate( { remainingTime: remainingTime } ) );
diff --git a/js/customize-post-status-control.js b/js/customize-post-status-control.js
@@ -110,15 +110,17 @@
 		 */
 		updateChoices: function updateChoices() {
 			var control = this, data = control.setting.get(), isFuture, postTimestamp, currentTimestamp;
-			postTimestamp = ( new Date( data.post_date ) ).valueOf();
-			currentTimestamp = ( new Date( api.Posts.getCurrentTime() ) ).valueOf();
+			postTimestamp = api.Posts.parsePostDate( data.post_date );
+			currentTimestamp = api.Posts.parsePostDate( api.Posts.getCurrentTime() );
 			isFuture = postTimestamp > currentTimestamp;
 
 			/*
 			 * Account for race condition when saving a post with an empty date
 			 * when server time and client time aren't exactly aligned. If the
 			 * status is publish, and yet the post date is less than 15 seconds
 			 * into the future, consider it as not future.
+			 *
+			 * See also https://github.com/xwp/wp-customize-posts/issues/303
 			 */
 			if ( isFuture && 'publish' === data.post_status && postTimestamp - currentTimestamp < 15 * 1000 ) {
 				isFuture = false;
diff --git a/js/customize-posts.js b/js/customize-posts.js
@@ -308,6 +308,7 @@
 		request = wp.ajax.post( 'customize-posts-fetch-settings', {
 			'customize-posts-nonce': api.settings.nonce['customize-posts'],
 			'wp_customize': 'on',
+			'customized': api.previewer.query().customized,
 			'post_ids': newPostIds
 		} );
 
@@ -533,13 +534,26 @@
 	component.getCurrentTime = function getCurrentTime() {
 		var currentDate, currentTimestamp, timestampDifferential;
 		currentTimestamp = ( new Date() ).valueOf();
-		currentDate = new Date( component.data.initialServerDate.replace( ' ', 'T' ) );
+		currentDate = component.parsePostDate( component.data.initialServerDate );
 		timestampDifferential = currentTimestamp - component.data.initialClientTimestamp;
 		timestampDifferential += component.data.initialClientTimestamp - component.data.initialServerTimestamp;
 		currentDate.setTime( currentDate.getTime() + timestampDifferential );
 		return component.formatDate( currentDate );
 	};
 
+	/**
+	 * Parse post date string in YYYY-MM-DD HH:MM:SS format (local timezone).
+	 *
+	 * @param {string} postDate Post date string.
+	 * @returns {Date} Parsed date.
+	 */
+	component.parsePostDate = function parsePostDate( postDate ) {
+		var dateParts = _.map( postDate.split( /\D/ ), function( datePart ) {
+			return parseInt( datePart, 10 );
+		} );
+		return new Date( dateParts[0], dateParts[1] - 1, dateParts[2], dateParts[3], dateParts[4], dateParts[5] ); // eslint-disable-line no-magic-numbers
+	};
+
 	/**
 	 * Focus on the control requested from the preview.
 	 *
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/xwp/wp-customize-posts.git"
   },
-  "version": "0.8.1",
+  "version": "0.8.2",
   "license": "GPL-2.0+",
   "private": true,
   "devDependencies": {
diff --git a/php/class-wp-customize-posts-preview.php b/php/class-wp-customize-posts-preview.php
@@ -860,9 +860,18 @@ public function _inject_meta_sql_customized_derived_tables( $matches ) {
 			/**
 			 * Filter the postmeta rows that are being previewed.
 			 *
-			 * @param array $postmeta_rows Postmeta rows, associative arrays with keys for post_id, meta_key, and meta_value.
+			 * @param array $postmeta_rows                   Postmeta rows, associative arrays with keys for post_id, meta_key, and meta_value.
+			 * @param WP_Customize_Postmeta_Setting $setting Post meta setting.
 			 */
-			$postmeta_rows = apply_filters( 'customize_previewed_postmeta_rows', $postmeta_rows );
+			$postmeta_rows = apply_filters( 'customize_previewed_postmeta_rows', $postmeta_rows, $setting );
+
+			/**
+			 * Filter the postmeta rows that are being previewed for a specific key.
+			 *
+			 * @param array                         $postmeta_rows Postmeta rows, associative arrays with keys for post_id, meta_key, and meta_value.
+			 * @param WP_Customize_Postmeta_Setting $setting       Post meta setting.
+			 */
+			$postmeta_rows = apply_filters( "customize_previewed_postmeta_rows_{$setting->meta_key}", $postmeta_rows, $setting );
 
 			$previewed_meta_keys = wp_list_pluck( $postmeta_rows, 'meta_key' );
 
diff --git a/php/class-wp-customize-posts.php b/php/class-wp-customize-posts.php
@@ -1322,25 +1322,32 @@ public function ajax_fetch_settings() {
 			wp_send_json_error( 'bad_post_ids' );
 		}
 
+		$this->manager->add_dynamic_settings( array_keys( $this->manager->unsanitized_post_values() ) );
+
 		$setting_params = array();
 		$settings = $this->get_settings( $post_ids );
 		foreach ( $settings as $setting ) {
 			if ( $setting->check_capabilities() ) {
+				$setting->preview();
 				$setting_params[ $setting->id ] = $this->get_setting_params( $setting );
 			}
 		}
 
 		// Return with a failure if any of the requested posts.
 		foreach ( $post_ids as $post_id ) {
-			$post = get_post( $post_id );
-			if ( empty( $post ) ) {
-				status_header( 404 );
-				wp_send_json_error( 'requested_post_absent' );
+			if ( $post_id < 0 ) {
+				$post_type = 'nav_menu_item';
+			} else {
+				$post_type = get_post_type( $post_id );
+				if ( empty( $post_type ) ) {
+					status_header( 404 );
+					wp_send_json_error( 'requested_post_absent' );
+				}
 			}
-			if ( 'nav_menu_item' === $post->post_type ) {
-				$setting_id = sprintf( 'nav_menu_item[%d]', $post->ID );
+			if ( 'nav_menu_item' === $post_type ) {
+				$setting_id = sprintf( 'nav_menu_item[%d]', $post_id );
 			} else {
-				$setting_id = WP_Customize_Post_Setting::get_post_setting_id( $post );
+				$setting_id = WP_Customize_Post_Setting::get_post_setting_id( get_post( $post_id ) );
 			}
 			if ( ! isset( $setting_params[ $setting_id ] ) ) {
 				status_header( 404 );
diff --git a/readme.md b/readme.md
@@ -8,7 +8,7 @@ Edit posts and postmeta in the Customizer. Stop editing your posts/postmeta blin
 **Tags:** [customizer](https://wordpress.org/plugins/tags/customizer), [customize](https://wordpress.org/plugins/tags/customize), [posts](https://wordpress.org/plugins/tags/posts), [postmeta](https://wordpress.org/plugins/tags/postmeta), [editor](https://wordpress.org/plugins/tags/editor), [preview](https://wordpress.org/plugins/tags/preview), [featured-image](https://wordpress.org/plugins/tags/featured-image), [page-template](https://wordpress.org/plugins/tags/page-template)  
 **Requires at least:** 4.5  
 **Tested up to:** 4.7-alpha  
-**Stable tag:** 0.8.1  
+**Stable tag:** 0.8.2  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
 
 [![Build Status](https://travis-ci.org/xwp/wp-customize-posts.svg?branch=master)](https://travis-ci.org/xwp/wp-customize-posts) [![Coverage Status](https://coveralls.io/repos/xwp/wp-customize-posts/badge.svg?branch=master)](https://coveralls.io/github/xwp/wp-customize-posts) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com) [![devDependency Status](https://david-dm.org/xwp/wp-customize-posts/dev-status.svg)](https://david-dm.org/xwp/wp-customize-posts#info=devDependencies) 
@@ -90,6 +90,15 @@ The following are listed in reverse chronological order. The first, more recent
 
 ## Changelog ##
 
+### [0.8.2] - 2016-10-03 ###
+* Fixed browser incompatible way of parsing local datetime strings. This is a follow-up on <a href="https://github.com/xwp/wp-customize-posts/pull/293" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/293" data-id="178983334" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#293</a>, which was not fully fixed in 0.8.1. PR <a href="https://github.com/xwp/wp-customize-posts/pull/304" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/304" data-id="180808420" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#304</a>.
+ * Improved fetching of post/postmeta settings so that the <code>customized</code> state is included in the request, and allow for placeholder <code>nav_menu_item</code> settings to be fetched. PR <a href="https://github.com/xwp/wp-customize-posts/pull/299" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/299" data-id="180154206" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#299</a>.
+ * Added <code>$setting</code> context to <code>customize_previewed_postmeta_rows</code> filter and add new <code>customize_previewed_postmeta_rows_{$setting-&gt;post_meta}</code> filter. PR <a href="https://github.com/xwp/wp-customize-posts/pull/299" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/299" data-id="180154206" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#299</a>.
+
+Props Weston Ruter (<a href="https://github.com/westonruter" class="user-mention">@westonruter</a>), Utkarsh Patel (<a href="https://github.com/PatelUtkarsh" class="user-mention">@PatelUtkarsh</a>).
+
+See <a href="https://github.com/xwp/wp-customize-posts/milestone/10?closed=1">issues and PRs in milestone</a> and <a href="https://github.com/xwp/wp-customize-posts/compare/0.8.1...0.8.2">full release commit log</a>.
+
 ### [0.8.1] - 2016-09-23 ###
 Fixed compatibility with Safari in the <code>wp.customize.Posts.getCurrentTime()</code> method. See <a href="https://github.com/xwp/wp-customize-posts/pull/293" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/293" data-id="178983334" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#293</a>. Props Piotr Delawski (<a href="https://github.com/delawski" class="user-mention">@delawski</a>).
 
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors:      xwp, westonruter, valendesigns
 Tags:              customizer, customize, posts, postmeta, editor, preview, featured-image, page-template
 Requires at least: 4.5
 Tested up to:      4.7-alpha
-Stable tag:        0.8.1
+Stable tag:        0.8.2
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -67,6 +67,16 @@ The following are listed in reverse chronological order. The first, more recent
 
 == Changelog ==
 
+= [0.8.2] - 2016-10-03 =
+
+ * Fixed browser incompatible way of parsing local datetime strings. This is a follow-up on <a href="https://github.com/xwp/wp-customize-posts/pull/293" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/293" data-id="178983334" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#293</a>, which was not fully fixed in 0.8.1. PR <a href="https://github.com/xwp/wp-customize-posts/pull/304" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/304" data-id="180808420" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#304</a>.
+ * Improved fetching of post/postmeta settings so that the <code>customized</code> state is included in the request, and allow for placeholder <code>nav_menu_item</code> settings to be fetched. PR <a href="https://github.com/xwp/wp-customize-posts/pull/299" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/299" data-id="180154206" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#299</a>.
+ * Added <code>$setting</code> context to <code>customize_previewed_postmeta_rows</code> filter and add new <code>customize_previewed_postmeta_rows_{$setting-&gt;post_meta}</code> filter. PR <a href="https://github.com/xwp/wp-customize-posts/pull/299" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/299" data-id="180154206" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#299</a>.
+
+Props Weston Ruter (<a href="https://github.com/westonruter" class="user-mention">@westonruter</a>), Utkarsh Patel (<a href="https://github.com/PatelUtkarsh" class="user-mention">@PatelUtkarsh</a>).
+
+See <a href="https://github.com/xwp/wp-customize-posts/milestone/10?closed=1">issues and PRs in milestone</a> and <a href="https://github.com/xwp/wp-customize-posts/compare/0.8.1...0.8.2">full release commit log</a>.
+
 = [0.8.1] - 2016-09-23 =
 
 Fixed compatibility with Safari in the <code>wp.customize.Posts.getCurrentTime()</code> method. See <a href="https://github.com/xwp/wp-customize-posts/pull/293" class="issue-link js-issue-link" data-url="https://github.com/xwp/wp-customize-posts/issues/293" data-id="178983334" data-error-text="Failed to load issue title" data-permission-text="Issue title is private">#293</a>. Props Piotr Delawski (<a href="https://github.com/delawski" class="user-mention">@delawski</a>).
diff --git a/tests/php/test-class-wp-customize-posts-preview.php b/tests/php/test-class-wp-customize-posts-preview.php
@@ -831,7 +831,10 @@ public function test_filter_get_meta_sql_to_inject_customized_state_with_customi
 		$postmeta_setting = $this->wp_customize->get_setting( $postmeta_setting_id );
 		$postmeta_setting->preview();
 
-		add_filter( 'customize_previewed_postmeta_rows', array( $this, 'filter_customize_previewed_postmeta_rows' ) );
+		$this->filter_customize_previewed_postmeta_rows_call_count = 0;
+		$this->filter_customize_previewed_postmeta_rows_member_call_count = 0;
+		add_filter( 'customize_previewed_postmeta_rows', array( $this, 'filter_customize_previewed_postmeta_rows' ), 10, 2 );
+		add_filter( "customize_previewed_postmeta_rows_{$meta_key}", array( $this, 'filter_customize_previewed_postmeta_rows_member' ), 10, 2 );
 
 		$query = new WP_Query( array(
 			'meta_key' => 'member_age',
@@ -840,6 +843,9 @@ public function test_filter_get_meta_sql_to_inject_customized_state_with_customi
 		) );
 		$this->assertEqualSets( array( $club3 ), wp_list_pluck( $query->posts, 'ID' ) );
 
+		$this->assertGreaterThan( 0, $this->filter_customize_previewed_postmeta_rows_call_count );
+		$this->assertGreaterThan( 0, $this->filter_customize_previewed_postmeta_rows_member_call_count );
+
 		$query = new WP_Query( array(
 			'meta_key' => 'member_age',
 			'meta_value' => 30,
@@ -857,20 +863,30 @@ public function test_filter_get_meta_sql_to_inject_customized_state_with_customi
 	 * @param mixed  $meta_value Meta value.
 	 */
 	public function add_postmeta_query_index( $meta_id, $post_id, $meta_key, $meta_value ) {
+		unset( $meta_id );
 		if ( 'member' === $meta_key && is_array( $meta_value ) ) {
 			foreach ( $meta_value as $key => $value ) {
 				add_post_meta( $post_id, "member_{$key}", $value );
 			}
 		}
 	}
 
+	protected $filter_customize_previewed_postmeta_rows_call_count = 0;
+	protected $filter_customize_previewed_postmeta_rows_member_call_count = 0;
+
 	/**
 	 * Filter previewed postmeta rows to inject query index postmeta for serialized values.
 	 *
-	 * @param array $postmeta_rows Postmeta rows.
+	 * @param array                         $postmeta_rows Postmeta rows.
+	 * @param WP_Customize_Postmeta_Setting $setting       Setting.
 	 * @return array Amended postmeta rows.
 	 */
-	public function filter_customize_previewed_postmeta_rows( $postmeta_rows ) {
+	public function filter_customize_previewed_postmeta_rows( $postmeta_rows, $setting ) {
+		$this->filter_customize_previewed_postmeta_rows_call_count += 1;
+		$this->assertInstanceOf( 'WP_Customize_Postmeta_Setting', $setting );
+		$this->assertInternalType( 'array', $postmeta_rows );
+		$this->assertEquals( 'member', $setting->meta_key );
+
 		$meta_key = 'member';
 		$index_postmeta_rows = array();
 		foreach ( $postmeta_rows as $postmeta_row ) {
@@ -887,6 +903,21 @@ public function filter_customize_previewed_postmeta_rows( $postmeta_rows ) {
 		return array_merge( $postmeta_rows, $index_postmeta_rows );
 	}
 
+	/**
+	 * Filter previewed postmeta rows to record invocations.
+	 *
+	 * @param array                         $postmeta_rows Postmeta rows.
+	 * @param WP_Customize_Postmeta_Setting $setting       Setting.
+	 * @return array Amended postmeta rows.
+	 */
+	public function filter_customize_previewed_postmeta_rows_member( $postmeta_rows, $setting ) {
+		$this->filter_customize_previewed_postmeta_rows_member_call_count += 1;
+		$this->assertInstanceOf( 'WP_Customize_Postmeta_Setting', $setting );
+		$this->assertInternalType( 'array', $postmeta_rows );
+		$this->assertEquals( 'member', $setting->meta_key );
+		return $postmeta_rows;
+	}
+
 	/**
 	 * Test filter_nav_menu_item_to_set_url().
 	 *

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "xwp/wp-customize-posts",`
`3`	`3`	`"description": "Manage posts and postmeta via the Customizer.",`
`4`		`- "version": "0.8.1",`
	`4`	`+ "version": "0.8.2",`
`5`	`5`	`"type": "wordpress-plugin",`
`6`	`6`	`"keywords": [ "customizer", "customize", "posts", "postmeta", "preview", "featured-image", "page-template" ],`
`7`	`7`	`"homepage": "https://github.com/xwp/wp-customize-posts/",`