Merge branch '1.0.x' into 1-0-x/prevent-js-error-language-switcher-no…

…t-found
antistatique · Sep 6, 2022 · 9249165 · 9249165
2 parents 2e1b6cc + 979b6cf
commit 9249165
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,5 +6,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 - init module with Cookies & Browser redirection on Homepage only
-- handling of language switcher not found preventing JS console error
 - handling of missing common JS library
+- remove dependency on JQuery
diff --git a/README.md b/README.md
@@ -50,13 +50,8 @@ if (typeof Drupal.homeRedirectLang == "undefined") {
 
 let links = document.querySelectorAll('.language-link');
 
-// Don't process when standard language switcher not found.
-if (links.length === 0) {
-  return;
-}
-
-links.forEach(box => {
-  box.addEventListener('click', function (event) {
+links.forEach(link => {
+  link.addEventListener('click', function (event) {
     var hreflang = event.target.getAttribute('hreflang');
     Drupal.homeRedirectLang.setPreferredLanguage(hreflang);
   });

diff --git a/home_redirect_lang.libraries.yml b/home_redirect_lang.libraries.yml
@@ -1,9 +1,6 @@
 common:
   js:
     js/home_redirect_lang.common.js: {}
-  dependencies:
-    - core/jquery
-    - core/jquery.cookie
 
 language_switcher:
   js:

diff --git a/js/home_redirect_lang.common.js b/js/home_redirect_lang.common.js
@@ -4,7 +4,7 @@
  * Common helper functions used by various parts of Homepage Redirect Language.
  */
 
-(function ($, Drupal, drupalSettings) {
+(function (Drupal) {
 
   'use strict';
 
@@ -22,4 +22,4 @@
     document.cookie = 'home_redirect_lang_preferred_langcode=' + langcode + '; expires=' + date.toUTCString() + '; path=/';
   };
 
-}(jQuery, Drupal, drupalSettings));
+}(Drupal));
diff --git a/js/home_redirect_lang.language_switcher.js b/js/home_redirect_lang.language_switcher.js
@@ -4,7 +4,7 @@
  * Defines the behavior of the language switcher cookie storage.
  */
 
-(function ($, Drupal, drupalSettings) {
+(function (Drupal) {
 
   'use strict';
 
@@ -23,13 +23,8 @@
 
       let links = document.querySelectorAll('.language-switcher-language-url .language-link');
 
-      // Don't process when standard language switcher not found.
-      if (links.length === 0) {
-        return;
-      }
-
-      links.forEach(box => {
-        box.addEventListener('click', function (event) {
+      links.forEach(link => {
+        link.addEventListener('click', function (event) {
           var hreflang = event.target.getAttribute('hreflang');
           Drupal.homeRedirectLang.setPreferredLanguage(hreflang);
         });
@@ -39,4 +34,4 @@
   };
 
 
-}(jQuery, Drupal, drupalSettings));
+}(Drupal));