Skip to content

Commit 1743f99

Browse files
committed
Merge branch 'refs/heads/release/3.14.0-beta' into epic/MAGE-721
# Conflicts: # composer.json
2 parents 6affc67 + 7a06152 commit 1743f99

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"version": "3.14.0-beta.2",
77
"require": {
88
"php": "~8.1|~8.2|~8.3",
9-
"magento/framework": "~102.0|~103.0",
9+
"magento/framework": "~103.0",
1010
"algolia/algoliasearch-client-php": "^4.0@beta",
1111
"guzzlehttp/guzzle": "^6.3.3|^7.3.0",
1212
"ext-json": "*",

view/frontend/web/internals/common.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ define(['jquery', 'algoliaBundle'], function ($, algoliaBundle) {
1414
return acc;
1515
}, {});
1616

17-
window.algolia = {
17+
window.algolia = {
1818
deprecatedHooks: [
1919
'beforeAutocompleteProductSourceOptions',
2020
'beforeAutocompleteSources'
@@ -85,7 +85,7 @@ define(['jquery', 'algoliaBundle'], function ($, algoliaBundle) {
8585
htmlspecialcharsEncode: string => {
8686
const regex = new RegExp(`[${Object.keys(SPECIAL_CHAR_ENCODE_MAP).join('')}]`, 'g');
8787
return string.replace(regex, (m) => SPECIAL_CHAR_ENCODE_MAP[m]);
88-
}
88+
}
8989
};
9090

9191
window.isMobile = function () {
@@ -629,7 +629,9 @@ define(['jquery', 'algoliaBundle'], function ($, algoliaBundle) {
629629
var input = $(this).closest('#algolia-searchbox').find('input');
630630

631631
input.val('');
632-
input.get(0).dispatchEvent(new Event('input'));
632+
if (input.length) {
633+
input.get(0).dispatchEvent(new Event('input'));
634+
}
633635

634636
handleInputCrossAutocomplete(input);
635637
});

0 commit comments

Comments
 (0)