tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 16:44:26 +00:00
Code Releases Activity

Fix areYouSure confirm (#32941)

Browse Source 
See the comment
This commit is contained in:
wxiaoguang 2024-12-22 01:11:22 +08:00 committed by GitHub
parent 23687a0a71
commit 09a0041965
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web_src/js/features/common-fetch-action.ts
View File

@ -3,6 +3,7 @@ import {showErrorToast} from '../modules/toast.ts';
import {addDelegatedEventListener, submitEventSubmitter} from '../utils/dom.ts'; import {addDelegatedEventListener, submitEventSubmitter} from '../utils/dom.ts';
import {confirmModal} from './comp/ConfirmModal.ts'; import {confirmModal} from './comp/ConfirmModal.ts';
import type {RequestOpts} from '../types.ts'; import type {RequestOpts} from '../types.ts';
import {ignoreAreYouSure} from '../vendor/jquery.are-you-sure.ts';
const {appSubUrl, i18n} = window.config; const {appSubUrl, i18n} = window.config;
@ -27,7 +28,7 @@ async function fetchActionDoRequest(actionElem: HTMLElement, url: string, opt: R
if (resp.status === 200) { if (resp.status === 200) {
let {redirect} = await resp.json(); let {redirect} = await resp.json();
redirect = redirect || actionElem.getAttribute('data-redirect'); redirect = redirect || actionElem.getAttribute('data-redirect');
actionElem.classList.remove('dirty'); // remove the areYouSure check before reloading ignoreAreYouSure(actionElem); // ignore the areYouSure check before reloading
if (redirect) { if (redirect) {
fetchActionDoRedirect(redirect); fetchActionDoRedirect(redirect);
} else { } else {

4
web_src/js/features/repo-editor.ts
View File

@ -6,7 +6,7 @@ import {attachRefIssueContextPopup} from './contextpopup.ts';
import {POST} from '../modules/fetch.ts'; import {POST} from '../modules/fetch.ts';
import {initDropzone} from './dropzone.ts'; import {initDropzone} from './dropzone.ts';
import {confirmModal} from './comp/ConfirmModal.ts'; import {confirmModal} from './comp/ConfirmModal.ts';
import {applyAreYouSure} from '../vendor/jquery.are-you-sure.ts'; import {applyAreYouSure, ignoreAreYouSure} from '../vendor/jquery.are-you-sure.ts';
import {fomanticQuery} from '../modules/fomantic/base.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts';
function initEditPreviewTab(elForm: HTMLFormElement) { function initEditPreviewTab(elForm: HTMLFormElement) {
@ -188,7 +188,7 @@ export function initRepoEditor() {
header: elForm.getAttribute('data-text-empty-confirm-header'), header: elForm.getAttribute('data-text-empty-confirm-header'),
content: elForm.getAttribute('data-text-empty-confirm-content'), content: elForm.getAttribute('data-text-empty-confirm-content'),
})) { })) {
elForm.classList.remove('dirty'); ignoreAreYouSure(elForm);
elForm.submit(); elForm.submit();
} }
} }

3
web_src/js/features/repo-issue.ts
View File

@ -16,6 +16,7 @@ import {GET, POST} from '../modules/fetch.ts';
import {showErrorToast} from '../modules/toast.ts'; import {showErrorToast} from '../modules/toast.ts';
import {initRepoIssueSidebar} from './repo-issue-sidebar.ts'; import {initRepoIssueSidebar} from './repo-issue-sidebar.ts';
import {fomanticQuery} from '../modules/fomantic/base.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts';
import {ignoreAreYouSure} from '../vendor/jquery.are-you-sure.ts';
const {appSubUrl} = window.config; const {appSubUrl} = window.config;
@ -578,7 +579,7 @@ export function initRepoIssueTitleEdit() {
} }
} }
} }
issueTitleEditor.classList.remove('dirty'); ignoreAreYouSure(issueTitleEditor);
window.location.reload(); window.location.reload();
} catch (error) { } catch (error) {
console.error(error); console.error(error);

6
web_src/js/vendor/jquery.are-you-sure.ts vendored
View File

@ -204,3 +204,9 @@ export function applyAreYouSure(selectorOrEl: string|Element|$, opts = {}) {
export function reinitializeAreYouSure(selectorOrEl: string|Element|$) { export function reinitializeAreYouSure(selectorOrEl: string|Element|$) {
$(selectorOrEl).trigger('reinitialize.areYouSure'); $(selectorOrEl).trigger('reinitialize.areYouSure');
} }
export function ignoreAreYouSure(selectorOrEl: string|Element|$) {
// here we should only add "ignore-dirty" but not remove "dirty".
// because when using "enter" to submit a form, the "dirty" class will appear again before reloading.
$(selectorOrEl).addClass('ignore-dirty');
}