-
-
Notifications
You must be signed in to change notification settings - Fork 6.1k
Remove jQuery AJAX from the diff functions #29743
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.
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -8,8 +8,9 @@ import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndC | |||||||||
import {initImageDiff} from './imagediff.js'; | ||||||||||
import {showErrorToast} from '../modules/toast.js'; | ||||||||||
import {submitEventSubmitter} from '../utils/dom.js'; | ||||||||||
import {POST, GET} from '../modules/fetch.js'; | ||||||||||
|
||||||||||
const {csrfToken, pageData, i18n} = window.config; | ||||||||||
const {pageData, i18n} = window.config; | ||||||||||
|
||||||||||
function initRepoDiffReviewButton() { | ||||||||||
const $reviewBox = $('#review-box'); | ||||||||||
|
@@ -63,8 +64,9 @@ function initRepoDiffConversationForm() { | |||||||||
if (isSubmittedByButton && submitter.name) { | ||||||||||
formData.append(submitter.name, submitter.value); | ||||||||||
} | ||||||||||
const formDataString = String(new URLSearchParams(formData)); | ||||||||||
const $newConversationHolder = $(await $.post($form.attr('action'), formDataString)); | ||||||||||
|
||||||||||
const response = await POST($form.attr('action'), {data: formData}); | ||||||||||
const $newConversationHolder = $(await response.text()); | ||||||||||
const {path, side, idx} = $newConversationHolder.data(); | ||||||||||
|
||||||||||
$form.closest('.conversation-holder').replaceWith($newConversationHolder); | ||||||||||
|
@@ -75,7 +77,8 @@ function initRepoDiffConversationForm() { | |||||||||
} | ||||||||||
$newConversationHolder.find('.dropdown').dropdown(); | ||||||||||
initCompReactionSelector($newConversationHolder); | ||||||||||
} catch { // here the caught error might be a jQuery AJAX error (thrown by await $.post), which is not good to use for error message handling | ||||||||||
} catch (error) { | ||||||||||
console.error('Error:', error); | ||||||||||
showErrorToast(i18n.network_error); | ||||||||||
} finally { | ||||||||||
$form.removeClass('is-loading'); | ||||||||||
|
@@ -89,15 +92,25 @@ function initRepoDiffConversationForm() { | |||||||||
const action = $(this).data('action'); | ||||||||||
const url = $(this).data('update-url'); | ||||||||||
|
||||||||||
const data = await $.post(url, {_csrf: csrfToken, origin, action, comment_id}); | ||||||||||
const params = new URLSearchParams(); | ||||||||||
params.append('origin', origin); | ||||||||||
params.append('action', action); | ||||||||||
params.append('comment_id', comment_id); | ||||||||||
|
||||||||||
yardenshoham marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||||||
if ($(this).closest('.conversation-holder').length) { | ||||||||||
const conversation = $(data); | ||||||||||
$(this).closest('.conversation-holder').replaceWith(conversation); | ||||||||||
conversation.find('.dropdown').dropdown(); | ||||||||||
initCompReactionSelector(conversation); | ||||||||||
} else { | ||||||||||
window.location.reload(); | ||||||||||
try { | ||||||||||
const response = await POST(url, {data: params}); | ||||||||||
yardenshoham marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||||||
const data = await response.text(); | ||||||||||
|
||||||||||
if ($(this).closest('.conversation-holder').length) { | ||||||||||
const conversation = $(data); | ||||||||||
$(this).closest('.conversation-holder').replaceWith(conversation); | ||||||||||
conversation.find('.dropdown').dropdown(); | ||||||||||
initCompReactionSelector(conversation); | ||||||||||
} else { | ||||||||||
window.location.reload(); | ||||||||||
} | ||||||||||
} catch (error) { | ||||||||||
console.error('Error:', error); | ||||||||||
} | ||||||||||
}); | ||||||||||
} | ||||||||||
|
@@ -132,18 +145,18 @@ function onShowMoreFiles() { | |||||||||
initImageDiff(); | ||||||||||
} | ||||||||||
|
||||||||||
export function loadMoreFiles(url) { | ||||||||||
export async function loadMoreFiles(url) { | ||||||||||
const $target = $('a#diff-show-more-files'); | ||||||||||
if ($target.hasClass('disabled') || pageData.diffFileInfo.isLoadingNewData) { | ||||||||||
return; | ||||||||||
} | ||||||||||
|
||||||||||
pageData.diffFileInfo.isLoadingNewData = true; | ||||||||||
$target.addClass('disabled'); | ||||||||||
$.ajax({ | ||||||||||
type: 'GET', | ||||||||||
url, | ||||||||||
}).done((resp) => { | ||||||||||
|
||||||||||
try { | ||||||||||
const response = await GET(url); | ||||||||||
const resp = await response.text(); | ||||||||||
const $resp = $(resp); | ||||||||||
// the response is a full HTML page, we need to extract the relevant contents: | ||||||||||
// 1. append the newly loaded file list items to the existing list | ||||||||||
|
@@ -152,10 +165,13 @@ export function loadMoreFiles(url) { | |||||||||
$('body').append($resp.find('script#diff-data-script')); | ||||||||||
|
||||||||||
onShowMoreFiles(); | ||||||||||
}).always(() => { | ||||||||||
} catch (error) { | ||||||||||
console.error('Error:', error); | ||||||||||
showErrorToast('An error occurred while loading more files.'); | ||||||||||
} finally { | ||||||||||
$target.removeClass('disabled'); | ||||||||||
pageData.diffFileInfo.isLoadingNewData = false; | ||||||||||
}); | ||||||||||
} | ||||||||||
} | ||||||||||
|
||||||||||
function initRepoDiffShowMore() { | ||||||||||
|
@@ -167,7 +183,7 @@ function initRepoDiffShowMore() { | |||||||||
loadMoreFiles(linkLoadMore); | ||||||||||
}); | ||||||||||
|
||||||||||
$(document).on('click', 'a.diff-load-button', (e) => { | ||||||||||
$(document).on('click', 'a.diff-load-button', async (e) => { | ||||||||||
e.preventDefault(); | ||||||||||
const $target = $(e.target); | ||||||||||
|
||||||||||
|
@@ -178,19 +194,22 @@ function initRepoDiffShowMore() { | |||||||||
$target.addClass('disabled'); | ||||||||||
|
||||||||||
const url = $target.data('href'); | ||||||||||
$.ajax({ | ||||||||||
type: 'GET', | ||||||||||
url, | ||||||||||
}).done((resp) => { | ||||||||||
|
||||||||||
try { | ||||||||||
const response = await GET(url); | ||||||||||
const resp = await response.text(); | ||||||||||
|
||||||||||
if (!resp) { | ||||||||||
$target.removeClass('disabled'); | ||||||||||
return; | ||||||||||
} | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because finally has done that. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe remove only There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done f7691ae |
||||||||||
$target.parent().replaceWith($(resp).find('#diff-file-boxes .diff-file-body .file-body').children()); | ||||||||||
onShowMoreFiles(); | ||||||||||
}).fail(() => { | ||||||||||
} catch (error) { | ||||||||||
console.error('Error:', error); | ||||||||||
} finally { | ||||||||||
$target.removeClass('disabled'); | ||||||||||
}); | ||||||||||
Comment on lines
-191
to
-193
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wait, |
||||||||||
} | ||||||||||
}); | ||||||||||
} | ||||||||||
|
||||||||||
|
Uh oh!
There was an error while loading. Please reload this page.