Skip to content

Commit

Permalink
Remove jQuery AJAX from common global functions (go-gitea#29528)
Browse files Browse the repository at this point in the history
- Removed all jQuery AJAX calls and replaced with our fetch wrapper
- Tested the locale change functionality and it works as before
- Tested the delete button functionality and it works as before

# Demo using `fetch` instead of jQuery AJAX

![action](https://github.com/go-gitea/gitea/assets/20454870/8a024f75-c2a5-4bff-898d-ca751d2489f1)

Signed-off-by: Yarden Shoham <[email protected]>
  • Loading branch information
yardenshoham authored Mar 2, 2024
1 parent 9de5e39 commit 8a0a83a
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions web_src/js/features/common-global.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {htmlEscape} from 'escape-goat';
import {showTemporaryTooltip} from '../modules/tippy.js';
import {confirmModal} from './comp/ConfirmModal.js';
import {showErrorToast} from '../modules/toast.js';
import {request, POST} from '../modules/fetch.js';
import {request, POST, GET} from '../modules/fetch.js';
import '../htmx.js';

const {appUrl, appSubUrl, csrfToken, i18n} = window.config;
Expand All @@ -37,11 +37,10 @@ export function initHeadNavbarContentToggle() {
}

export function initFootLanguageMenu() {
function linkLanguageAction() {
async function linkLanguageAction() {
const $this = $(this);
$.get($this.data('url')).always(() => {
window.location.reload();
});
await GET($this.data('url'));
window.location.reload();
}

$('.language-menu a[lang]').on('click', linkLanguageAction);
Expand Down Expand Up @@ -309,27 +308,26 @@ export function initGlobalLinkActions() {

dialog.modal({
closable: false,
onApprove() {
onApprove: async () => {
if ($this.data('type') === 'form') {
$($this.data('form')).trigger('submit');
return;
}

const postData = {
_csrf: csrfToken,
};
const postData = new FormData();
for (const [key, value] of Object.entries(dataArray)) {
if (key && key.startsWith('data')) {
postData[key.slice(4)] = value;
postData.append(key.slice(4), value);
}
if (key === 'id') {
postData['id'] = value;
postData.append('id', value);
}
}

$.post($this.data('url'), postData).done((data) => {
const response = await POST($this.data('url'), {data: postData});
if (response.ok) {
const data = await response.json();
window.location.href = data.redirect;
});
}
}
}).modal('show');
}
Expand Down

0 comments on commit 8a0a83a

Please sign in to comment.