From 0dc6919e2dfa9d4fee29c77980e3a873dd5a6431 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 23 Mar 2024 23:31:19 +0200 Subject: [PATCH] Remove jQuery `.attr` from the common global functions (#30023) - Switched from jQuery `.attr` to plain javascript `getAttribute` - Tested the show/hide modal buttons, they work as before Signed-off-by: Yarden Shoham (cherry picked from commit 900dd79d8adaf2569df0f1346b6e6e91ed4b5ad3) --- web_src/js/features/common-global.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 2469361c6e..e27935a86e 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -301,8 +301,8 @@ export function initGlobalLinkActions() { const $this = $(this); const dataArray = $this.data(); let filter = ''; - if ($this.attr('data-modal-id')) { - filter += `#${$this.attr('data-modal-id')}`; + if (this.getAttribute('data-modal-id')) { + filter += `#${this.getAttribute('data-modal-id')}`; } const $dialog = $(`.delete.modal${filter}`); @@ -352,8 +352,7 @@ function initGlobalShowModal() { // If there is a ".{attr}" part like "data-modal-form.action", then the form's "action" attribute will be set. $('.show-modal').on('click', function (e) { e.preventDefault(); - const $el = $(this); - const modalSelector = $el.attr('data-modal'); + const modalSelector = this.getAttribute('data-modal'); const $modal = $(modalSelector); if (!$modal.length) { throw new Error('no modal for this action'); @@ -406,7 +405,7 @@ export function initGlobalButtons() { // a '.show-panel' element can show a panel, by `data-panel="selector"` // if it has "toggle" class, it toggles the panel e.preventDefault(); - const sel = $(this).attr('data-panel'); + const sel = this.getAttribute('data-panel'); if (this.classList.contains('toggle')) { toggleElem(sel); } else { @@ -417,12 +416,12 @@ export function initGlobalButtons() { $('.hide-panel').on('click', function (e) { // a `.hide-panel` element can hide a panel, by `data-panel="selector"` or `data-panel-closest="selector"` e.preventDefault(); - let sel = $(this).attr('data-panel'); + let sel = this.getAttribute('data-panel'); if (sel) { hideElem($(sel)); return; } - sel = $(this).attr('data-panel-closest'); + sel = this.getAttribute('data-panel-closest'); if (sel) { hideElem($(this).closest(sel)); return;