homelab/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-07 07:16:09 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

chore: don't auto refresh the merge box when user has interacted with it (#38435)

Browse Source 
Otherwise, the user just isn't able to use "auto merge" form
This commit is contained in:
wxiaoguang
2026-07-13 14:38:41 +08:00
committed by GitHub
parent f69e15afe7
commit d15cfa363a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web_src/js/features/repo-issue-pull.ts
+10 -1
View File
@@ -36,10 +36,19 @@ async function initRepoPullRequestMergeForm(box: HTMLElement) {
} }
function initRepoPullMergeBoxRefresh(el: Element) { function initRepoPullMergeBoxRefresh(el: Element) {
// The merge box has complex buttons & form, if the user has interacted with any element, don't refresh.
// Otherwise, the user won't be able to merge or schedule a merge (auto-merge) when the PR status is not ready.
let interacted = false;
const interactionEvents = ['focusin', 'mousedown', 'click', 'keydown', 'input'];
for (const event of interactionEvents) {
el.addEventListener(event, () => { interacted = true }, {capture: true});
}
activePageTimerRefresh({ activePageTimerRefresh({
once: true, // on successful refresh, the data-global-init will re-initialize the element once: true, // on successful refresh, the data-global-init will re-initialize the element
interval: () => Number(el.getAttribute('data-pull-merge-box-reloading-interval')), interval: () => interacted ? 0 : Number(el.getAttribute('data-pull-merge-box-reloading-interval')),
async callback() { async callback() {
if (interacted) return;
const pullLink = el.getAttribute('data-pull-link')!; const pullLink = el.getAttribute('data-pull-link')!;
const resp = await GET(`${pullLink}/merge_box`); const resp = await GET(`${pullLink}/merge_box`);
if (!resp.ok) return; if (!resp.ok) return;