Skip to content

Commit

Permalink
Remove jQuery .attr from the common global functions (#30023)
Browse files Browse the repository at this point in the history
- Switched from jQuery `.attr` to plain javascript `getAttribute`
- Tested the show/hide modal buttons, they work as before

Signed-off-by: Yarden Shoham <[email protected]>
  • Loading branch information
yardenshoham committed Mar 23, 2024
1 parent 75e2e5c commit 900dd79
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions web_src/js/features/common-global.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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 {
Expand All @@ -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;
Expand Down

0 comments on commit 900dd79

Please sign in to comment.