Restore href instead of path

Automattic · Oct 23, 2019 · dd54001 · dd54001
1 parent 90605a8
commit dd54001
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/modules/search/class.jetpack-search.php b/modules/search/class.jetpack-search.php
@@ -251,7 +251,6 @@ public function load_assets() {
 					'postTypeFilters'    => $widget_options['post_types'],
 					'postTypes'          => $post_type_labels,
 					'siteId'             => Jetpack::get_option( 'id' ),
-					'siteUrl'            => site_url(),
 					'sort'               => $widget_options['sort'],
 					'widgets'            => array_values( $widgets ),
 				);

diff --git a/modules/search/instant-search/components/search-app.jsx b/modules/search/instant-search/components/search-app.jsx
@@ -25,7 +25,7 @@ import {
 	setSortQuery,
 	getSortQuery,
 	hasFilter,
-	restorePreviousPath,
+	restorePreviousHref,
 	getSearchQuery,
 } from '../lib/query-string';
 import { removeChildren, hideElements, hideChildren, showChildren } from '../lib/dom';
@@ -97,7 +97,7 @@ class SearchApp extends Component {
 
 		this.setState( { showResults: false }, () => {
 			showChildren( this.props.themeOptions.resultsSelector );
-			restorePreviousPath( this.props.initialPath );
+			restorePreviousHref( this.props.initialHref );
 		} );
 	}
 

diff --git a/modules/search/instant-search/index.jsx b/modules/search/instant-search/index.jsx
@@ -18,7 +18,7 @@ const injectSearchApp = grabFocus => {
 	render(
 		<SearchApp
 			grabFocus={ grabFocus }
-			initialPath={ window[ SERVER_OBJECT_NAME ].siteUrl }
+			initialHref={ window.location.href }
 			initialSort={ determineDefaultSort( window[ SERVER_OBJECT_NAME ].sort, getSearchQuery() ) }
 			isSearchPage={ getSearchQuery() !== '' }
 			options={ window[ SERVER_OBJECT_NAME ] }

diff --git a/modules/search/instant-search/lib/query-string.js b/modules/search/instant-search/lib/query-string.js
@@ -28,9 +28,9 @@ function pushQueryString( queryString ) {
 	}
 }
 
-export function restorePreviousPath( newUrl ) {
+export function restorePreviousHref( initialHref ) {
 	if ( history.pushState ) {
-		window.history.pushState( { path: newUrl }, '', newUrl );
+		window.history.pushState( { href: initialHref }, '', initialHref );
 		window.dispatchEvent( new Event( 'queryStringChange' ) );
 	}
 }