Browse Source

move handleGlobalEnterQuickSubmit into a separate file to avoid cycle-import (#20679)

pull/20043/merge
wxiaoguang 1 week ago committed by GitHub
parent
commit
42d9a6a980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      web_src/js/features/common-global.js
  2. 2
      web_src/js/features/comp/EasyMDE.js
  3. 15
      web_src/js/features/comp/QuickSubmit.js

15
web_src/js/features/common-global.js

@ -5,6 +5,7 @@ import createDropzone from './dropzone.js';
import {initCompColorPicker} from './comp/ColorPicker.js';
import {showGlobalErrorMessage} from '../bootstrap.js';
import {attachDropdownAria} from './aria.js';
import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
const {appUrl, csrfToken} = window.config;
@ -53,20 +54,6 @@ export function initGlobalEnterQuickSubmit() {
});
}
export function handleGlobalEnterQuickSubmit(target) {
const $target = $(target);
const $form = $(target).closest('form');
if ($form.length) {
// here use the event to trigger the submit event (instead of calling `submit()` method directly)
// otherwise the `areYouSure` handler won't be executed, then there will be an annoying "confirm to leave" dialog
$form.trigger('submit');
} else {
// if no form, then the editor is for an AJAX request, dispatch an event to the target, let the target's event handler to do the AJAX request.
// the 'ce-' prefix means this is a CustomEvent
$target.trigger('ce-quick-submit');
}
}
export function initGlobalButtonClickOnEnter() {
$(document).on('keypress', '.ui.button', (e) => {
if (e.keyCode === 13 || e.keyCode === 32) { // enter key or space bar

2
web_src/js/features/comp/EasyMDE.js

@ -1,6 +1,6 @@
import $ from 'jquery';
import attachTribute from '../tribute.js';
import {handleGlobalEnterQuickSubmit} from '../common-global.js';
import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js';
/**
* @returns {EasyMDE}

15
web_src/js/features/comp/QuickSubmit.js

@ -0,0 +1,15 @@
import $ from 'jquery';
export function handleGlobalEnterQuickSubmit(target) {
const $target = $(target);
const $form = $(target).closest('form');
if ($form.length) {
// here use the event to trigger the submit event (instead of calling `submit()` method directly)
// otherwise the `areYouSure` handler won't be executed, then there will be an annoying "confirm to leave" dialog
$form.trigger('submit');
} else {
// if no form, then the editor is for an AJAX request, dispatch an event to the target, let the target's event handler to do the AJAX request.
// the 'ce-' prefix means this is a CustomEvent
$target.trigger('ce-quick-submit');
}
}
Loading…
Cancel
Save