tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorder history logic

Browse Source
This commit is contained in:
Thomas Gelf 2014-03-06 09:41:22 +00:00
parent 3ad869ff23
commit 25032204ee
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,8 +255,6 @@
active = $('[href].active', req.$target).attr('href'); active = $('[href].active', req.$target).attr('href');
} }
req.$target.attr('data-icinga-url', url);
// //
var target = req.getResponseHeader('X-Icinga-Container'); var target = req.getResponseHeader('X-Icinga-Container');
var newBody = false; var newBody = false;
@ -290,22 +288,6 @@
this.icinga.ui.setWindowId(windowId); this.icinga.ui.setWindowId(windowId);
} }
// Update history when necessary. Don't do so for requests triggered
// by history or autorefresh events
if (! req.historyTriggered && ! req.autorefresh) {
// We only want to care about top-level containers
if (req.$target.parent().closest('.container').length === 0) {
this.icinga.history.pushCurrentState();
/*
this.icinga.logger.debug('Pushing ', req.url, ' to history');
if (typeof window.history.pushState !== 'undefined') {
window.history.pushState({icinga: true}, null, req.url);
}
*/
}
}
// Handle search requests, still hardcoded // Handle search requests, still hardcoded
if (req.url === '/search' && if (req.url === '/search' &&
req.$target.data('icingaUrl') === '/search') req.$target.data('icingaUrl') === '/search')
@ -334,6 +316,16 @@
req.$target.attr('data-icinga-url', req.url); req.$target.attr('data-icinga-url', req.url);
req.$target.data('icingaUrl', req.url); req.$target.data('icingaUrl', req.url);
// Update history when necessary. Don't do so for requests triggered
// by history or autorefresh events
if (! req.historyTriggered && ! req.autorefresh) {
// We only want to care about top-level containers
if (req.$target.parent().closest('.container').length === 0) {
this.icinga.history.pushCurrentState();
}
}
/* Should we try to fiddle with responses containing full HTML? */ /* Should we try to fiddle with responses containing full HTML? */
/* /*
if ($('body', $resp).length) { if ($('body', $resp).length) {