Resolve jQuery and DOM deprecations

hasgeek · Jun 7, 2024 · 374cc91 · 374cc91
1 parent 73b1e6c
commit 374cc91
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 39 deletions.
diff --git a/funnel/assets/js/index.js b/funnel/assets/js/index.js
@@ -6,7 +6,7 @@ import Ticketing from './utils/ticket_widget';
 $(() => {
   window.Hasgeek.homeInit = function homeInit(markdownContainer, tickets = '') {
     // Expand CFP section
-    $('.jquery-show-all').click(function showAll(event) {
+    $('.jquery-show-all').on('click', function showAll(event) {
       event.preventDefault();
       const projectElemClass = `.${$(this).data('projects')}`;
       $(projectElemClass).removeClass('mui--hide');

diff --git a/funnel/assets/js/labels_form.js b/funnel/assets/js/labels_form.js
@@ -29,7 +29,7 @@ $(() => {
         },
       });
     }
-    $('#add-sublabel-form').click((e) => {
+    $('#add-sublabel-form').on('click', (e) => {
       e.preventDefault();
       $('#child-form').append(formHtml);
       activateFormWidgets();

diff --git a/funnel/assets/js/project_header.js b/funnel/assets/js/project_header.js
@@ -34,7 +34,7 @@ $(() => {
       });
     }
 
-    $('a.js-register-btn').click(function showRegistrationModal() {
+    $('a.js-register-btn').on('click', function showRegistrationModal() {
       window.history.pushState(
         {
           openModal: true,

diff --git a/funnel/assets/js/submission.js b/funnel/assets/js/submission.js
@@ -59,7 +59,7 @@ export const LabelsWidget = {
         self.updateLabels('', attr, false);
       } else {
         $(this).addClass('checked');
-        $(this).siblings().find('input[type="radio"]').first().click();
+        $(this).siblings().find('input[type="radio"]').first().trigger('click');
       }
     });
 

diff --git a/funnel/assets/js/utils/analytics.js b/funnel/assets/js/utils/analytics.js
@@ -11,16 +11,16 @@ const Analytics = {
   },
   init() {
     // Send click events to Google analytics
-    $('.mui-btn, a').click(function gaHandler() {
+    $('.mui-btn, a').on('click', function gaHandler() {
       const action = $(this).attr('data-ga') || $(this).attr('title') || $(this).html();
       const target = $(this).attr('data-target') || $(this).attr('href') || '';
       Analytics.sendToGA('click', action, target);
     });
-    $('.ga-login-btn').click(function gaHandler() {
+    $('.ga-login-btn').on('click', function gaHandler() {
       const action = $(this).attr('data-ga');
       Analytics.sendToGA('login', action);
     });
-    $('.search-form__submit').click(function gaHandler() {
+    $('.search-form__submit').on('click', function gaHandler() {
       const target = $('.js-search-field').val();
       Analytics.sendToGA('search', target, target);
     });

diff --git a/funnel/assets/js/utils/formhelper.js b/funnel/assets/js/utils/formhelper.js
@@ -63,8 +63,7 @@ const Form = {
   },
   preventSubmitOnEnter(id) {
     $(`#${id}`).on('keyup keypress', (e) => {
-      const code = e.keyCode || e.which;
-      if (code === 13) {
+      if (e.key === 'Enter') {
         e.preventDefault();
         return false;
       }
@@ -187,7 +186,7 @@ const Form = {
   handleFormSubmit(formId, url, onSuccess, onError, config) {
     $(`#${formId}`)
       .find('button[type="submit"]')
-      .click((event) => {
+      .on('click', (event) => {
         event.preventDefault();
         Form.ajaxFormSubmit(formId, url, onSuccess, onError, config);
       });

diff --git a/funnel/assets/js/utils/jsonform.js b/funnel/assets/js/utils/jsonform.js
@@ -24,7 +24,7 @@ const jsonForm = Vue.component('jsonform', {
       };
       $(`#${this.formid}`)
         .find('button[type="submit"]')
-        .click((event) => {
+        .on('click', (event) => {
           event.preventDefault();
           Form.ajaxFormSubmit(this.formid, url, onSuccess, onError, {
             contentType: 'application/json',

diff --git a/funnel/assets/js/utils/modalhelper.js b/funnel/assets/js/utils/modalhelper.js
@@ -1,6 +1,6 @@
 const Modal = {
   handleModalForm() {
-    $('.js-modal-form').click(function addModalToWindowHash() {
+    $('.js-modal-form').on('click', function addModalToWindowHash() {
       window.location.hash = $(this).data('hash');
     });
 
@@ -27,7 +27,7 @@ const Modal = {
     const hashId = window.location.hash.split('#')[1];
     if (hashId) {
       if ($(`a.js-modal-form[data-hash="${hashId}"]`).length) {
-        $(`a[data-hash="${hashId}"]`).click();
+        $(`a[data-hash="${hashId}"]`).trigger('click');
       }
     }
 
@@ -47,7 +47,7 @@ const Modal = {
     $this.find('.modal__close').focus();
 
     $this.on('keydown', (event) => {
-      if (event.keyCode !== 9) return;
+      if (event.key !== 'Tab') return;
       focusedItem = $(document.activeElement);
       focusedItemIndex = focusableItems.index(focusedItem);
       if (!event.shiftKey && focusedItemIndex === numberOfFocusableItems - 1) {

diff --git a/funnel/assets/js/utils/tabs.js b/funnel/assets/js/utils/tabs.js
@@ -35,16 +35,16 @@ const Tabs = {
       .wrap('<div class="md-tablist-wrapper"></div>')
       .before($leftIcons)
       .after($rightIcons);
-    $(icons.left.touch).click(function previousTab() {
+    $(icons.left.touch).on('click', function previousTab() {
       tablist.dispatchEvent(new Event('previous-tab'));
     });
-    $(icons.right.touch).click(function nextTab() {
+    $(icons.right.touch).on('click', function nextTab() {
       tablist.dispatchEvent(new Event('next-tab'));
     });
-    $(icons.left.scroll).click(function scrollLeft() {
+    $(icons.left.scroll).on('click', function scrollLeft() {
       tablist.dispatchEvent(new Event('scroll-left'));
     });
-    $(icons.right.scroll).click(function scrollRight() {
+    $(icons.right.scroll).on('click', function scrollRight() {
       tablist.dispatchEvent(new Event('scroll-right'));
     });
   },
@@ -119,21 +119,19 @@ const Tabs = {
   },
   enhanceARIA(tablist, $tabs) {
     $tabs.on('keydown', function addArrowNav(event) {
-      const [LEFT, UP, RIGHT, DOWN] = [37, 38, 39, 40];
-      const k = event.which || event.keyCode;
-      if (k >= LEFT && k <= DOWN) {
-        switch (k) {
-          case LEFT:
-          case UP:
-            tablist.dispatchEvent(new Event('previous-tab'));
-            break;
-          case RIGHT:
-          case DOWN:
-            tablist.dispatchEvent(new Event('next-tab'));
-            break;
-          default:
-        }
-        event.preventDefault();
+      const k = event.key;
+      switch (k) {
+        case 'ArrowLeft':
+        case 'ArrowUp':
+          event.preventDefault();
+          tablist.dispatchEvent(new Event('previous-tab'));
+          break;
+        case 'ArrowRight':
+        case 'ArrowDown':
+          event.preventDefault();
+          tablist.dispatchEvent(new Event('next-tab'));
+          break;
+        default:
       }
     });
     $tabs.each(function addTabListeners(tabIndex, tab) {

diff --git a/funnel/assets/js/utils/ticket_widget.js b/funnel/assets/js/utils/ticket_widget.js
@@ -120,7 +120,7 @@ const Ticketing = {
       this.openTicketModal();
     }
 
-    $('.js-open-ticket-widget').click((event) => {
+    $('.js-open-ticket-widget').on('click', (event) => {
       event.preventDefault();
       this.openTicketModal();
     });

diff --git a/funnel/static/js/libs/spectrum.js b/funnel/static/js/libs/spectrum.js
@@ -304,15 +304,15 @@
       }
 
       // Prevent clicks from bubbling up to document.  This would cause it to be hidden.
-      container.click(stopPropagation);
+      container.on('click', stopPropagation);
 
       // Handle user typed input
-      textInput.change(setFromTextInput);
+      textInput.on('change', setFromTextInput);
       textInput.bind('paste', function () {
         setTimeout(setFromTextInput, 1);
       });
-      textInput.keydown(function (e) {
-        if (e.keyCode == 13) {
+      textInput.on('keydown', function (e) {
+        if (e.key === 'Enter') {
           setFromTextInput();
         }
       });

diff --git a/funnel/templates/siteadmin_comments.html.jinja2 b/funnel/templates/siteadmin_comments.html.jinja2
@@ -107,7 +107,7 @@
 
 {% block footerscripts %}
 <script type="text/javascript">
-  $("#check-comments-selectall:checkbox").change(function (e) {
+  $("#check-comments-selectall:checkbox").on("change", function (e) {
     e.preventDefault();
     $(".field-comment-id").attr("checked", this.checked);
   });