From d64b9757e8a4728135885e029f3932ff8f71dad3 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 23 Mar 2024 14:37:18 +0200
Subject: [PATCH] Remove jQuery `.attr` from the diff page (#30021)
- Switched from jQuery `.attr` to plain javascript `getAttribute` and
`setAttribute`
- Tested the review box counter and Previous/Next code review
conversation buttons. They work as before
---------
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 74c1378dfb5f1831ca2bf1f0b18ab150134f4beb)
---
web_src/js/features/repo-diff.js | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/web_src/js/features/repo-diff.js b/web_src/js/features/repo-diff.js
index ffe3fada85..2feb2597e4 100644
--- a/web_src/js/features/repo-diff.js
+++ b/web_src/js/features/repo-diff.js
@@ -13,16 +13,20 @@ import {POST, GET} from '../modules/fetch.js';
const {pageData, i18n} = window.config;
function initRepoDiffReviewButton() {
- const $reviewBox = $('#review-box');
- const $counter = $reviewBox.find('.review-comments-counter');
+ const reviewBox = document.getElementById('review-box');
+ if (!reviewBox) return;
+
+ const $reviewBox = $(reviewBox);
+ const counter = reviewBox.querySelector('.review-comments-counter');
+ if (!counter) return;
$(document).on('click', 'button[name="pending_review"]', (e) => {
const $form = $(e.target).closest('form');
// Watch for the form's submit event.
$form.on('submit', () => {
- const num = parseInt($counter.attr('data-pending-comment-number')) + 1 || 1;
- $counter.attr('data-pending-comment-number', num);
- $counter.text(num);
+ const num = parseInt(counter.getAttribute('data-pending-comment-number')) + 1 || 1;
+ counter.setAttribute('data-pending-comment-number', num);
+ counter.textContent = num;
// Force the browser to reflow the DOM. This is to ensure that the browser replay the animation
$reviewBox.removeClass('pulse');
$reviewBox.width();
@@ -67,7 +71,7 @@ function initRepoDiffConversationForm() {
formData.append(submitter.name, submitter.value);
}
- const response = await POST($form.attr('action'), {data: formData});
+ const response = await POST(e.target.getAttribute('action'), {data: formData});
const $newConversationHolder = $(await response.text());
const {path, side, idx} = $newConversationHolder.data();
@@ -120,7 +124,7 @@ export function initRepoDiffConversationNav() {
const index = $conversations.index($conversation);
const previousIndex = index > 0 ? index - 1 : $conversations.length - 1;
const $previousConversation = $conversations.eq(previousIndex);
- const anchor = $previousConversation.find('.comment').first().attr('id');
+ const anchor = $previousConversation.find('.comment').first()[0].getAttribute('id');
window.location.href = `#${anchor}`;
});
$(document).on('click', '.next-conversation', (e) => {
@@ -129,7 +133,7 @@ export function initRepoDiffConversationNav() {
const index = $conversations.index($conversation);
const nextIndex = index < $conversations.length - 1 ? index + 1 : 0;
const $nextConversation = $conversations.eq(nextIndex);
- const anchor = $nextConversation.find('.comment').first().attr('id');
+ const anchor = $nextConversation.find('.comment').first()[0].getAttribute('id');
window.location.href = `#${anchor}`;
});
}
@@ -175,8 +179,7 @@ function initRepoDiffShowMore() {
$(document).on('click', 'a#diff-show-more-files', (e) => {
e.preventDefault();
- const $target = $(e.target);
- const linkLoadMore = $target.attr('data-href');
+ const linkLoadMore = e.target.getAttribute('data-href');
loadMoreFiles(linkLoadMore);
});