tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modal.js: Trigger a real submit upon autosubmit

This commit is contained in:
Johannes Meyer 2023-05-19 13:15:14 +02:00
parent 63eae12d33
commit 7da5eb0972
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/js/icinga/behavior/modal.js
View File

@ -91,7 +91,7 @@
* @param $autoSubmittedBy {jQuery} The element triggering the auto submit, if any
* @returns {boolean}
*/
Modal.prototype.onFormSubmit = function(event, $autoSubmittedBy) {
Modal.prototype.onFormSubmit = function(event) {
var _this = event.data.self;
var $form = $(event.currentTarget).closest('form');
var $modal = $form.closest('#modal');
@ -105,6 +105,14 @@
$form.removeData('submitButton');
}
let $autoSubmittedBy;
if (! $autoSubmittedBy && event.detail && event.detail.submittedBy) {
$autoSubmittedBy = $(event.detail.submittedBy);
}
// Prevent our other JS from running
$modal[0].dataset.noIcingaAjax = '';
var req = _this.icinga.loader.submitForm($form, $autoSubmittedBy, $button);
req.addToHistory = false;
req.$redirectTarget = $modal.data('redirectTarget');
@ -117,6 +125,8 @@
if (req.getResponseHeader('X-Icinga-Redirect')) {
_this.hide($modal);
}
}).always(function () {
delete $modal[0].dataset.noIcingaAjax;
});
if (typeof $autoSubmittedBy === 'undefined') {
@ -136,7 +146,17 @@
* @returns {boolean}
*/
Modal.prototype.onFormAutoSubmit = function(event) {
return event.data.self.onFormSubmit(event, $(event.currentTarget));
let form = event.currentTarget.form;
let modal = form.closest('#modal');
// Prevent our other JS from running
modal.dataset.noIcingaAjax = '';
form.dispatchEvent(new CustomEvent('submit', {
cancelable: true,
bubbles: true,
detail: { submittedBy: event.currentTarget }
}));
};
/**