Skip to content

Commit cb6282e

Browse files
committed
fix
1 parent ff5106d commit cb6282e

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-5
lines changed

web_src/js/features/common-global.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {initCompColorPicker} from './comp/ColorPicker.js';
66
import {showGlobalErrorMessage} from '../bootstrap.js';
77
import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
88
import {svg} from '../svg.js';
9-
import {hideElem, showElem, toggleElem} from '../utils/dom.js';
9+
import {hideElem, showElem, toggleElem, initSubmitEventSubmitterPolyfill, submitEventSubmitterGet} from '../utils/dom.js';
1010
import {htmlEscape} from 'escape-goat';
1111
import {showTemporaryTooltip} from '../modules/tippy.js';
1212
import {confirmModal} from './comp/ConfirmModal.js';
@@ -121,7 +121,8 @@ async function formFetchAction(e) {
121121
const formMethod = formEl.getAttribute('method') || 'get';
122122
const formActionUrl = formEl.getAttribute('action');
123123
const formData = new FormData(formEl);
124-
const [submitterName, submitterValue] = [e.submitter?.getAttribute('name'), e.submitter?.getAttribute('value')];
124+
const formSubmitter = submitEventSubmitterGet(e);
125+
const [submitterName, submitterValue] = [formSubmitter?.getAttribute('name'), formSubmitter?.getAttribute('value')];
125126
if (submitterName) {
126127
formData.append(submitterName, submitterValue || '');
127128
}
@@ -192,6 +193,7 @@ export function initGlobalCommon() {
192193

193194
$('.tabular.menu .item').tab();
194195

196+
initSubmitEventSubmitterPolyfill();
195197
document.addEventListener('submit', formFetchAction);
196198
document.addEventListener('click', linkAction);
197199
}

web_src/js/features/common-issue-list.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import $ from 'jquery';
2-
import {isElemHidden, onInputDebounce, toggleElem} from '../utils/dom.js';
2+
import {isElemHidden, onInputDebounce, submitEventSubmitterGet, toggleElem} from '../utils/dom.js';
33
import {GET} from '../modules/fetch.js';
44

55
const {appSubUrl} = window.config;
@@ -40,7 +40,7 @@ export function initCommonIssueListQuickGoto() {
4040
$form.on('submit', (e) => {
4141
// if there is no goto button, or the form is submitted by non-quick-goto elements, submit the form directly
4242
let doQuickGoto = !isElemHidden($goto);
43-
const submitter = e.originalEvent.submitter;
43+
const submitter = submitEventSubmitterGet(e.originalEvent);
4444
if (submitter !== $form[0] && submitter !== $input[0] && submitter !== $goto[0]) doQuickGoto = false;
4545
if (!doQuickGoto) return;
4646

web_src/js/features/repo-diff.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {validateTextareaNonEmpty} from './comp/ComboMarkdownEditor.js';
77
import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from './pull-view-file.js';
88
import {initImageDiff} from './imagediff.js';
99
import {showErrorToast} from '../modules/toast.js';
10+
import {submitEventSubmitterGet} from '../utils/dom.js';
1011

1112
const {csrfToken, pageData, i18n} = window.config;
1213

@@ -57,7 +58,7 @@ function initRepoDiffConversationForm() {
5758
const formData = new FormData($form[0]);
5859

5960
// if the form is submitted by a button, append the button's name and value to the form data
60-
const submitter = e.originalEvent?.submitter;
61+
const submitter = submitEventSubmitterGet(e.originalEvent);
6162
const isSubmittedByButton = (submitter?.nodeName === 'BUTTON') || (submitter?.nodeName === 'INPUT' && submitter.type === 'submit');
6263
if (isSubmittedByButton && submitter.name) {
6364
formData.append(submitter.name, submitter.value);

web_src/js/utils/dom.js

+17
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,20 @@ export function loadElem(el, src) {
194194
el.src = src;
195195
});
196196
}
197+
198+
// some browsers like PaleMoon don't have "SubmitEvent" support, so we need to polyfill it (a tricky method): use the last clicked button as submitter
199+
const needSubmitEventSubmitterPolyfill = typeof SubmitEvent === 'undefined';
200+
201+
export function submitEventSubmitterGet(e) {
202+
return needSubmitEventSubmitterPolyfill ? (e.target._submitter || null) : e.submitter;
203+
}
204+
205+
export function initSubmitEventSubmitterPolyfill() {
206+
if (!needSubmitEventSubmitterPolyfill) return;
207+
console.warn(`This browser doesn't have "SubmitEvent" support, use a tricky method to polyfill`);
208+
document.addEventListener('mousedown', (e) => {
209+
if (!e.target.form) return;
210+
const isSubmitButton = ((e.target.nodeName === 'INPUT' || e.target.nodeName === 'BUTTON') && e.target.type === 'submit');
211+
e.target.form._submitter = isSubmitButton ? e.target : null;
212+
});
213+
}

0 commit comments

Comments
 (0)