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

loader.js: Only pre-wrap a search response's html with a div 

It's not required for all responses anymore.

refs #3953
This commit is contained in:
Johannes Meyer 2019-09-23 08:49:19 +02:00
parent d699191629
commit b15c012671
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,8 +445,6 @@
_this.loadUrl(_this.url('/layout/announcements'), $('#announcements'));
}
// div helps getting an XML tree
var $resp = $('<div>' + req.responseText + '</div>');
var active = false;
var rendered = false;
var classes;
@ -521,33 +519,32 @@
}
// Handle search requests, still hardcoded.
if (req.url.match(/^\/search/) &&
req.$target.data('icingaUrl').match(/^\/search/) &&
$('.dashboard', $resp).length > 0 &&
$('.dashboard .container', req.$target).length > 0)
{
// TODO: We need dashboard pane and container identifiers (not ids)
var targets = [];
$('.dashboard .container', req.$target).each(function (idx, el) {
targets.push($(el));
});
if (req.url.match(/^\/search/) && req.$target.data('icingaUrl').match(/^\/search/)) {
var $resp = $('<div>' + req.responseText + '</div>'); // div helps getting an XML tree
if ($('.dashboard', $resp).length > 0 && $('.dashboard .container', req.$target).length > 0) {
// TODO: We need dashboard pane and container identifiers (not ids)
var targets = [];
$('.dashboard .container', req.$target).each(function (idx, el) {
targets.push($(el));
});
var i = 0;
// Searching for '.dashboard .container' in $resp doesn't dork?!
$('.dashboard .container', $resp).each(function (idx, el) {
var $el = $(el);
if ($el.hasClass('dashboard')) {
return;
}
var url = $el.data('icingaUrl');
targets[i].data('icingaUrl', url);
var title = $('h1', $el).first();
$('h1', targets[i]).first().replaceWith(title);
var i = 0;
// Searching for '.dashboard .container' in $resp doesn't dork?!
$('.dashboard .container', $resp).each(function (idx, el) {
var $el = $(el);
if ($el.hasClass('dashboard')) {
return;
}
var url = $el.data('icingaUrl');
targets[i].data('icingaUrl', url);
var title = $('h1', $el).first();
$('h1', targets[i]).first().replaceWith(title);
_this.loadUrl(url, targets[i]);
i++;
});
rendered = true;
_this.loadUrl(url, targets[i]);
i++;
});
rendered = true;
}
}
var referrer = req.referrer;
@ -574,8 +571,7 @@
this.icinga.timer.unregister(req.progressTimer);
}
// .html() removes outer div we added above
this.renderContentToContainer($resp.html(), req.$target, req.action, req.autorefresh, req.forceFocus, autoSubmit);
this.renderContentToContainer(req.responseText, req.$target, req.action, req.autorefresh, req.forceFocus, autoSubmit);
if (oldNotifications) {
oldNotifications.appendTo($('#notifications'));
}