Merge pull request #209 from localgovdrupal/fix/2.x/replace-deprecate…

…d-javascript-apis fix: replace deprecated javascript apis
localgovdrupal · Jan 21, 2025 · c55caf1 · c55caf1
2 parents 0dde9d0 + 0eacb75
commit c55caf1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/modules/localgov_subsites_paragraphs/js/localgov-accordion.js b/modules/localgov_subsites_paragraphs/js/localgov-accordion.js
@@ -247,7 +247,7 @@
       // Trigger create/destroy functions at different screen widths
       // based on the value of data-accordion-tabs-switch attribute.
       if (window.matchMedia) {
-        mq.addListener(() => {
+        mq.addEventListener("change", () => {
           breakpointCheck();
         });
         breakpointCheck();

diff --git a/modules/localgov_subsites_paragraphs/js/localgov-tabs.es6.js b/modules/localgov_subsites_paragraphs/js/localgov-tabs.es6.js
@@ -80,8 +80,8 @@
             tab.addEventListener('keydown', e => {
               let newActiveControl;
 
-              switch (e.which) {
-                case 37:
+              switch (e.key) {
+                case 'ArrowLeft':
                   // Left arrow. If there's a previous element, switch to it.
                   if (i - 1 >= 0) {
                     newActiveControl = tabList
@@ -94,7 +94,7 @@
                     newActiveControl[0].focus();
                   }
                   break;
-                case 39:
+                case 'ArrowRight':
                   // Right arrow. If there's a next element, switch to it.
                   if (i + 1 < tabPanelsNumber) {
                     newActiveControl = tabList
@@ -107,7 +107,7 @@
                     newActiveControl[0].focus();
                   }
                   break;
-                case 40:
+                case 'ArrowDown':
                   // Arrow down. Move focus into the active panel.
                   tabPanels[i].focus();
                   break;
@@ -177,7 +177,7 @@
       // Trigger create/destroy functions at different screen widths
       // based on the value of data-accordion-tabs-switch attribute.
       if (window.matchMedia) {
-        mq.addListener(() => {
+        mq.addEventListener("change", () => {
           breakpointCheck();
         });
         breakpointCheck();

diff --git a/modules/localgov_subsites_paragraphs/js/localgov-tabs.js b/modules/localgov_subsites_paragraphs/js/localgov-tabs.js
@@ -89,24 +89,24 @@
               tab.addEventListener('keydown', function (e) {
                 var newActiveControl = void 0;
 
-                switch (e.which) {
-                  case 37:
+                switch (e.key) {
+                  case 'ArrowLeft':
                     // Left arrow. If there's a previous element, switch to it.
                     if (i - 1 >= 0) {
                       newActiveControl = tabList.querySelectorAll('li')[i - 1].querySelectorAll('button');
                       Drupal.behaviors.localgovTabs.switchTab(newActiveControl[0], tabs);
                       newActiveControl[0].focus();
                     }
                     break;
-                  case 39:
+                  case 'ArrowRight':
                     // Right arrow. If there's a next element, switch to it.
                     if (i + 1 < tabPanelsNumber) {
                       newActiveControl = tabList.querySelectorAll('li')[i + 1].querySelectorAll('button');
                       Drupal.behaviors.localgovTabs.switchTab(newActiveControl[0], tabs);
                       newActiveControl[0].focus();
                     }
                     break;
-                  case 40:
+                  case 'ArrowDown':
                     // Arrow down. Move focus into the active panel.
                     tabPanels[i].focus();
                     break;
@@ -179,7 +179,7 @@
       // Trigger create/destroy functions at different screen widths
       // based on the value of data-accordion-tabs-switch attribute.
       if (window.matchMedia) {
-        mq.addListener(function () {
+        mq.addEventListener("change", () => {
           breakpointCheck();
         });
         breakpointCheck();