Skip to content

Commit

Permalink
Merge master (v1.33.7) into develop (#1182)
Browse files Browse the repository at this point in the history
Merge master (v1.33.7) into develop
  • Loading branch information
nmanu1 committed Apr 12, 2024
2 parents d4e6a6c + 98210ae commit c7fa931
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "answers-hitchhiker-theme",
"version": "1.33.6",
"version": "1.33.7",
"description": "A starter Search theme for hitchhikers",
"keywords": [
"jambo",
Expand Down
10 changes: 8 additions & 2 deletions static/js/theme-map/VerticalFullPageMapOrchestrator.js
Expand Up @@ -8,6 +8,7 @@ import ZoomTriggers from './Maps/ZoomTriggers.js';
import PanTriggers from './Maps/PanTriggers.js';
import MobileStates from './MobileStates';

import QueryTriggers from '../constants/query-triggers.js';
import StorageKeys from '../constants/storage-keys.js';

/**
Expand Down Expand Up @@ -184,7 +185,13 @@ class VerticalFullPageMapOrchestrator extends ANSWERS.Component {
this.core.storage.registerListener({
eventType: 'update',
storageKey: StorageKeys.QUERY,
callback: () => this.updateMostRecentSearchState()
callback: () => {
const queryTrigger = this.core.storage.get(StorageKeys.QUERY_TRIGGER);
if (queryTrigger !== QueryTriggers.PAGINATION) {
this.core.clearStaticFilterNode('SearchThisArea');
}
this.updateMostRecentSearchState();
}
});

const searchThisAreaToggleEls = this._container.querySelectorAll('.js-searchThisAreaToggle');
Expand Down Expand Up @@ -680,7 +687,6 @@ class VerticalFullPageMapOrchestrator extends ANSWERS.Component {
useFacets: true
});
this.updateMostRecentSearchState();
this.core.clearStaticFilterNode('SearchThisArea');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions static/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion static/package.json
@@ -1,6 +1,6 @@
{
"name": "answers-hitchhiker-theme",
"version": "1.33.6",
"version": "1.33.7",
"description": "Toolchain for use with the HH Theme",
"main": "Gruntfile.js",
"scripts": {
Expand Down

0 comments on commit c7fa931

Please sign in to comment.