diff --git a/layouts/html.hbs b/layouts/html.hbs index d41854428..2563ebd2c 100644 --- a/layouts/html.hbs +++ b/layouts/html.hbs @@ -80,6 +80,7 @@ diff --git a/package-lock.json b/package-lock.json index aa6f50f58..cde675738 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "answers-hitchhiker-theme", - "version": "1.21.0", + "version": "1.21.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9c4c98492..87a4b46ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "answers-hitchhiker-theme", - "version": "1.21.0", + "version": "1.21.1", "description": "A starter answers theme for hitchhikers", "scripts": { "test": "cross-env NODE_ICU_DATA=node_modules/full-icu jest --verbose", diff --git a/script/partials/sdk-js-script-tags.hbs b/script/partials/sdk-js-script-tags.hbs index 4f93801be..3f916e6cd 100644 --- a/script/partials/sdk-js-script-tags.hbs +++ b/script/partials/sdk-js-script-tags.hbs @@ -6,11 +6,9 @@ \ No newline at end of file diff --git a/static/js/theme-map/VerticalFullPageMapOrchestrator.js b/static/js/theme-map/VerticalFullPageMapOrchestrator.js index b5099e95a..7aa7334e4 100644 --- a/static/js/theme-map/VerticalFullPageMapOrchestrator.js +++ b/static/js/theme-map/VerticalFullPageMapOrchestrator.js @@ -67,7 +67,7 @@ class VerticalFullPageMapOrchestrator extends ANSWERS.Component { * The default zoom level for the map * @type {number} */ - this.defaultZoom = this.providerOptions.zoom || 14; + this.defaultZoom = this.providerOptions.zoom || 4; /** * The current zoom level of the map @@ -597,6 +597,7 @@ class VerticalFullPageMapOrchestrator extends ANSWERS.Component { useFacets: true }); this.updateMostRecentSearchState(); + this.core.clearStaticFilterNode('SearchThisArea'); } /** diff --git a/static/package-lock.json b/static/package-lock.json index dbc2bb216..775425cd2 100644 --- a/static/package-lock.json +++ b/static/package-lock.json @@ -1,6 +1,6 @@ { "name": "answers-hitchhiker-theme", - "version": "1.21.0", + "version": "1.21.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/static/package.json b/static/package.json index 5cc473c98..8581a8d37 100644 --- a/static/package.json +++ b/static/package.json @@ -1,6 +1,6 @@ { "name": "answers-hitchhiker-theme", - "version": "1.21.0", + "version": "1.21.1", "description": "Toolchain for use with the HH Theme", "main": "Gruntfile.js", "scripts": { diff --git a/templates/vertical-full-page-map/page-setup.js b/templates/vertical-full-page-map/page-setup.js index 9e01130d2..48540c3b8 100644 --- a/templates/vertical-full-page-map/page-setup.js +++ b/templates/vertical-full-page-map/page-setup.js @@ -1,31 +1,11 @@ -function addFullPageMap() { - {{> theme-components/theme-map/script}} - {{> theme-components/vertical-full-page-map/script}} -} - -if (window.locatorBundleLoaded) { - addFullPageMap(); -} else { - const locatorBundleScript = document.querySelector('script#js-answersLocatorBundleScript'); - locatorBundleScript.onload = () => { - window.locatorBundleLoaded = true; - locatorBundleScript.dispatchEvent(new Event('vertical-full-page-map-bundle-loaded')); - addFullPageMap(); - } -} +{{> theme-components/theme-map/script}} +{{> theme-components/vertical-full-page-map/script}} /** - * Registers listeners on the card once the locator bundle is loaded + * Registers listeners on the card * * @param {ANSWERS.Component} card A location card */ -function registerVerticalFullPageMapCardListeners(card) { - if (window.locatorBundleLoaded) { - new VerticalFullPageMap.CardListenerAssigner({card: card}).addListenersToCard(); - return; - } - const verticalFullPageMapScript = document.querySelector('script#js-verticalFullPageMapScript'); - verticalFullPageMapScript.addEventListener('vertical-full-page-map-bundle-loaded', () => { - new VerticalFullPageMap.CardListenerAssigner({card: card}).addListenersToCard(); - }); + function registerVerticalFullPageMapCardListeners(card) { + new VerticalFullPageMap.CardListenerAssigner({card: card}).addListenersToCard(); } \ No newline at end of file diff --git a/templates/vertical-full-page-map/page.html.hbs b/templates/vertical-full-page-map/page.html.hbs index 7302b1077..ea861d123 100644 --- a/templates/vertical-full-page-map/page.html.hbs +++ b/templates/vertical-full-page-map/page.html.hbs @@ -17,8 +17,7 @@ {{> templates/vertical-full-page-map/script/locationbias modifier="main" }} {{> templates/vertical-full-page-map/script/locationbias modifier="mobileMap" }} {{/script/core }} - +
diff --git a/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch b/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch index f4cc27221..fca029815 100644 --- a/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch +++ b/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch @@ -1,5 +1,5 @@ ---- locations_full_page_map_with_filters.html.hbs -+++ locations_full_page_map_with_filters.html.hbs +--- templates/vertical-full-page-map/page.html.hbs 2021-05-24 14:53:55.000000000 -0400 ++++ test-site/pages/locations_full_page_map_with_filters.html.hbs 2021-05-24 14:58:17.000000000 -0400 @@ -1,7 +1,7 @@ {{#> layouts/html pageWrapperCss="YxtPage-wrapper--mobileListView" }} {{#> script/core }} diff --git a/tests/script/partials/sdk-js-script-tags.js b/tests/script/partials/sdk-js-script-tags.js index f12e37ef0..3492097fa 100644 --- a/tests/script/partials/sdk-js-script-tags.js +++ b/tests/script/partials/sdk-js-script-tags.js @@ -3,24 +3,20 @@ const hbs = require('../../test-utils/hbs'); const defaultOutput = ` `; const jaOutput = ` `;