From f0155d4d15729296b656cff7ed0a6ccb6a0b473f Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Sun, 19 Jan 2025 13:42:02 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20upgrade=20awesomeplete?= =?UTF-8?q?=20package=20to=20version=201.1.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a86f34ca6e83..fcdf8e2455349 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@popperjs/core": "^2.11.8", "@webcomponents/webcomponentsjs": "^2.8.0", "accessibility": "^3.0.17", - "awesomplete": "^1.1.5", + "awesomplete": "^1.1.7", "bootstrap": "5.3.3", "choices.js": "^9.1.0", "chosen-js": "^1.8.7", diff --git a/package.json b/package.json index 9f41f930ab071..f6e39da7f09ec 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@popperjs/core": "^2.11.8", "@webcomponents/webcomponentsjs": "^2.8.0", "accessibility": "^3.0.17", - "awesomplete": "^1.1.5", + "awesomplete": "^1.1.7", "bootstrap": "5.3.3", "choices.js": "^9.1.0", "chosen-js": "^1.8.7", From f0df42ad727735811c5b8156a09a56066828cb65 Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Sun, 19 Jan 2025 13:56:29 +0100 Subject: [PATCH 2/3] Pass language string for listLabel option to awesomplete initalization --- build/media_source/com_finder/js/finder.es6.js | 2 +- components/com_finder/tmpl/search/default_form.php | 1 + language/en-GB/com_finder.ini | 1 + modules/mod_finder/tmpl/default.php | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/media_source/com_finder/js/finder.es6.js b/build/media_source/com_finder/js/finder.es6.js index 62ff50fcb7d60..143e9df05aaf7 100644 --- a/build/media_source/com_finder/js/finder.es6.js +++ b/build/media_source/com_finder/js/finder.es6.js @@ -69,7 +69,7 @@ document.querySelectorAll('.js-finder-search-query').forEach((searchword) => { // Handle the auto suggestion if (Joomla.getOptions('finder-search')) { - searchword.awesomplete = new Awesomplete(searchword); + searchword.awesomplete = new Awesomplete(searchword, {listLabel: Joomla.Text._('COM_FINDER_SEARCH_FORM_LIST_LABEL')}); // If the current value is empty, set the previous value. searchword.addEventListener('input', onInputChange); diff --git a/components/com_finder/tmpl/search/default_form.php b/components/com_finder/tmpl/search/default_form.php index d4001ac5d4bcd..c6130453e5852 100644 --- a/components/com_finder/tmpl/search/default_form.php +++ b/components/com_finder/tmpl/search/default_form.php @@ -22,6 +22,7 @@ $this->getDocument()->getWebAssetManager()->usePreset('awesomplete'); $this->getDocument()->addScriptOptions('finder-search', ['url' => Route::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component', false)]); + Text::script('COM_FINDER_SEARCH_FORM_LIST_LABEL'); Text::script('JLIB_JS_AJAX_ERROR_OTHER'); Text::script('JLIB_JS_AJAX_ERROR_PARSE'); } diff --git a/language/en-GB/com_finder.ini b/language/en-GB/com_finder.ini index dd727eff73845..9aabb1c9df587 100644 --- a/language/en-GB/com_finder.ini +++ b/language/en-GB/com_finder.ini @@ -45,6 +45,7 @@ COM_FINDER_QUERY_TOKEN_OPTIONAL="%s is optional" COM_FINDER_QUERY_TOKEN_REQUIRED="%s is required" COM_FINDER_SEARCH_ADVANCED_LEGEND="Advanced Search" COM_FINDER_SEARCH_FORM_LEGEND="Search Form" +COM_FINDER_SEARCH_FORM_LIST_LABEL="Search Results" COM_FINDER_SEARCH_NO_RESULTS_BODY="No search results could be found for query: %s." COM_FINDER_SEARCH_NO_RESULTS_BODY_MULTILANG="No search results in English (en-GB) could be found for query: %s." COM_FINDER_SEARCH_NO_RESULTS_HEADING="No Results Found" diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php index dcde897991376..b1bcbdd9a2ad1 100644 --- a/modules/mod_finder/tmpl/default.php +++ b/modules/mod_finder/tmpl/default.php @@ -52,6 +52,7 @@ $wa->usePreset('awesomplete'); $app->getDocument()->addScriptOptions('finder-search', ['url' => Route::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component', false)]); + Text::script('COM_FINDER_SEARCH_FORM_LIST_LABEL'); Text::script('JLIB_JS_AJAX_ERROR_OTHER'); Text::script('JLIB_JS_AJAX_ERROR_PARSE'); } From ec89bb314033833e0d6aff4cc97e5abf9f51088c Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Sun, 19 Jan 2025 15:29:52 +0100 Subject: [PATCH 3/3] cs --- build/media_source/com_finder/js/finder.es6.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/com_finder/js/finder.es6.js b/build/media_source/com_finder/js/finder.es6.js index 143e9df05aaf7..21d402470ec24 100644 --- a/build/media_source/com_finder/js/finder.es6.js +++ b/build/media_source/com_finder/js/finder.es6.js @@ -69,7 +69,7 @@ document.querySelectorAll('.js-finder-search-query').forEach((searchword) => { // Handle the auto suggestion if (Joomla.getOptions('finder-search')) { - searchword.awesomplete = new Awesomplete(searchword, {listLabel: Joomla.Text._('COM_FINDER_SEARCH_FORM_LIST_LABEL')}); + searchword.awesomplete = new Awesomplete(searchword, { listLabel: Joomla.Text._('COM_FINDER_SEARCH_FORM_LIST_LABEL') }); // If the current value is empty, set the previous value. searchword.addEventListener('input', onInputChange);