tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-26 03:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modal: Modal request detection and hide if success

Browse Source
This commit is contained in:
Marius Hein 2019-10-21 15:36:32 +02:00
parent cf65d4d626
commit 8ea0908841
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/js/icinga/loader.js
View File

@ -132,6 +132,13 @@
contentType = false; contentType = false;
} }
var isModal = headers['X-Icinga-Modal'] === true && true;
if (! isModal && $target.closest('#modal-overlay')) {
isModal = true;
headers['X-Icinga-Modal'] = true;
}
var _this = this; var _this = this;
var req = $.ajax({ var req = $.ajax({
type : method, type : method,
@ -151,8 +158,9 @@
req.autorefresh = autorefresh; req.autorefresh = autorefresh;
req.method = method; req.method = method;
req.action = action; req.action = action;
req.addToHistory = headers['X-Icinga-Modal'] !== true && true; req.addToHistory = isModal !== true && true;
req.progressTimer = progressTimer; req.progressTimer = progressTimer;
req.modal = isModal;
if (url.match(/#/)) { if (url.match(/#/)) {
req.forceFocus = url.split(/#/)[1]; req.forceFocus = url.split(/#/)[1];
@ -669,6 +677,10 @@
} }
if (this.processRedirectHeader(req)) { if (this.processRedirectHeader(req)) {
if (req.modal) {
icinga.behaviors.modal.hide();
}
return; return;
} }