Skip to content

Remove jQuery .attr from the diff page #30021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 23, 2024
Merged

Remove jQuery .attr from the diff page #30021

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b12e97
Remove jQuery `.attr` from the diff page
yardenshoham Mar 23, 2024
7b5aa9e
Update web_src/js/features/repo-diff.js
yardenshoham Mar 23, 2024
34a3762
Update web_src/js/features/repo-diff.js
yardenshoham Mar 23, 2024
5e11780
Merge branch 'main' into repo-diff-jquery-attr
yardenshoham Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions web_src/js/features/repo-diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -65,7 +69,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();

Expand Down Expand Up @@ -118,7 +122,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) => {
Expand All @@ -127,7 +131,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}`;
});
}
Expand Down Expand Up @@ -173,8 +177,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);
});

Expand Down