Merge branch 'develop'

features/autosuggest/assets/js/src/autosuggest.js

@@ -84,11 +84,15 @@
 	 * @param searchText
 	 * @returns object
 	 */
-	function buildSearchQuery( searchText, postType, searchFields ) {
+	function buildSearchQuery( searchText, postType, postStatus, searchFields ) {
 		if ( postType === 'all' || typeof( postType ) === 'undefined' || postType === '' ) {
 			postType = 'all';
 		}
 
+		if ( postStatus === '' ) {
+			postType = 'publish';
+		}
+
 		var query = {
 			sort: [
 				{
@@ -105,20 +109,30 @@
 			}
 		};
 
-		// If we're specifying post types, do it in an array
+		// If we're specifying post types/statuses, do it in an array
 		if ( typeof postType === 'string' && postType !== 'all' ) {
-			postType = postType.split(',');
+			postType = postType.split( ',' );
+		}
+
+		if ( typeof postStatus === 'string' ) {
+			postStatus = postStatus.split( ',' );
 		}
 
 		// Then add it as a filter to the end of the query
-		if ( $.isArray( postType ) ) {
-			query.post_filter = {
-				bool: {
-					must: [{
-						terms: { 'post_type.raw': postType }
-					}]
-				}
-			};
+		query.post_filter = {
+			bool: {
+				must: [
+					{
+						terms: { post_status: postStatus }
+					}
+				]
+			}
+		};
+
+		if ( 'all' !== postType ) {
+			query.post_filter.bool.must.push( {
+				terms: { 'post_type.raw': postType }
+			} );
 		}
 
 		return query;
@@ -168,7 +182,7 @@
 		}
 
 		for ( i = 0; i < options.length; ++i ) {
-			var text = options[i].text.toLowerCase();
+			var text = options[i].text;
 			var url = options[i].url;
 			itemString = '<li><span class="autosuggest-item" data-search="' + text + '" data-url="' + url + '">' + text + '</span></li>';
 			$( itemString ).appendTo( $localSuggestList );
@@ -303,10 +317,11 @@
 			var query;
 			var request;
 			var postType = epas.postType;
+			var postStatus = epas.postStatus;
 			var searchFields = epas.searchFields;
 
 			if ( val.length >= 2 ) {
-				query = buildSearchQuery( val, postType, searchFields );
+				query = buildSearchQuery( val, postType, postStatus, searchFields );
 				request = esSearch( query );
 
 				request.done( function( response ) {

features/autosuggest/autosuggest.php

@@ -180,7 +180,8 @@ function ep_autosuggest_enqueue_scripts() {
 	 */
 	wp_localize_script( 'elasticpress-autosuggest', 'epas', apply_filters( 'ep_autosuggest_options', array(
 		'endpointUrl'  => esc_url( untrailingslashit( $endpoint_url ) ),
-		'postType'     => apply_filters( 'ep_term_suggest_post_type', 'all' ),
+		'postType'     => apply_filters( 'ep_term_suggest_post_type', array( 'post', 'page' ) ),
+		'postStatus'   => apply_filters( 'ep_term_suggest_post_status', 'publish' ),
 		'searchFields' => apply_filters( 'ep_term_suggest_search_fields', array(
 			'post_title.suggest',
 			'term_suggest',

lang/elasticpress.pot

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ElasticPress 2.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/elasticpress\n"
-"POT-Creation-Date: 2017-10-04 22:21:05+00:00\n"
+"POT-Creation-Date: 2017-11-01 20:37:24+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -143,27 +143,27 @@ msgstr ""
 msgid "Unable to reach Elasticsearch Server! Check that service is running."
 msgstr ""
 
-#: classes/class-ep-api.php:2183
+#: classes/class-ep-api.php:2212
 msgid ""
 "Invalid response from ElasticPress server. Please contact your "
 "administrator."
 msgstr ""
 
-#: classes/class-ep-api.php:2196
+#: classes/class-ep-api.php:2225
 msgid ""
 "Site not indexed. <p>Please run: <code>wp elasticpress index --setup "
 "--network-wide</code> using WP-CLI. Or use the index button on the left of "
 "this screen.</p>"
 msgstr ""
 
-#: classes/class-ep-api.php:2200
+#: classes/class-ep-api.php:2229
 msgid ""
 "Site not indexed. <p>Please run: <code>wp elasticpress index --setup</code> "
 "using WP-CLI. Or use the index button on the left of this screen.</p>"
 msgstr ""
 
-#: classes/class-ep-api.php:2335 classes/class-ep-api.php:2447
-#: classes/class-ep-api.php:2498
+#: classes/class-ep-api.php:2364 classes/class-ep-api.php:2476
+#: classes/class-ep-api.php:2527
 msgid "Elasticsearch Host is not available."
 msgstr ""
 
@@ -336,14 +336,14 @@ msgstr ""
 msgid "This address will be exposed to the public."
 msgstr ""
 
-#: features/autosuggest/autosuggest.php:206
+#: features/autosuggest/autosuggest.php:207
 msgid ""
 "This feature modifies the site’s default user experience by presenting a "
 "list of suggestions below detected search fields as text is entered into "
 "the field."
 msgstr ""
 
-#: features/autosuggest/autosuggest.php:209
+#: features/autosuggest/autosuggest.php:210
 msgid ""
 "You aren't using <a href='https://elasticpress.io'>ElasticPress.io</a> so "
 "we can't be sure your host is properly secured. Autosuggest requires a "
@@ -457,14 +457,14 @@ msgstr ""
 msgid "Weight results by date"
 msgstr ""
 
-#: features/woocommerce/woocommerce.php:661
+#: features/woocommerce/woocommerce.php:672
 msgid ""
 "“I want a cotton, woman’s t-shirt, for under $15 that’s in stock.” Faceted "
 "product browsing strains servers and increases load times. Your buyers can "
 "find the perfect product quickly, and buy it quickly."
 msgstr ""
 
-#: features/woocommerce/woocommerce.php:672
+#: features/woocommerce/woocommerce.php:683
 msgid ""
 "Most caching and performance tools can’t keep up with the nearly infinite "
 "ways your visitors might filter or navigate your products. No matter how "
@@ -474,7 +474,7 @@ msgid ""
 "end product management."
 msgstr ""
 
-#: features/woocommerce/woocommerce.php:686
+#: features/woocommerce/woocommerce.php:697
 msgid "WooCommerce not installed."
 msgstr ""