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

Fix CSS issues when rerendering the layout 

fixes #13467
This commit is contained in:
Eric Lippmann 2016-12-12 15:02:51 +01:00
parent 67e41af308
commit e030229d7f
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,6 +480,7 @@
newBody = true; newBody = true;
} }
if (target !== 'layout') {
var moduleName = req.getResponseHeader('X-Icinga-Module'); var moduleName = req.getResponseHeader('X-Icinga-Module');
classes = $.grep(req.$target.classes(), function (el) { classes = $.grep(req.$target.classes(), function (el) {
if (el === 'icinga-module' || el.match(/^module\-/)) { if (el === 'icinga-module' || el.match(/^module\-/)) {
@ -499,11 +500,6 @@
} }
req.$target.attr('class', classes.join(' ')); req.$target.attr('class', classes.join(' '));
var title = req.getResponseHeader('X-Icinga-Title');
if (title && ! req.autorefresh && req.$target.closest('.dashboard').length === 0) {
this.icinga.ui.setTitle(decodeURIComponent(title));
}
var refresh = req.autoRefreshInterval || req.getResponseHeader('X-Icinga-Refresh'); var refresh = req.autoRefreshInterval || req.getResponseHeader('X-Icinga-Refresh');
if (refresh) { if (refresh) {
req.$target.data('icingaRefresh', refresh); req.$target.data('icingaRefresh', refresh);
@ -513,6 +509,12 @@
req.$target.removeAttr('data-icinga-refresh'); req.$target.removeAttr('data-icinga-refresh');
} }
} }
}
var title = req.getResponseHeader('X-Icinga-Title');
if (title && ! req.autorefresh && req.$target.closest('.dashboard').length === 0) {
this.icinga.ui.setTitle(decodeURIComponent(title));
}
// Set a window identifier if the server asks us to do so // Set a window identifier if the server asks us to do so
var windowId = req.getResponseHeader('X-Icinga-WindowId'); var windowId = req.getResponseHeader('X-Icinga-WindowId');