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

loader.js: Split processRedirectHeader() to allow partly reuse 

refs #8758
This commit is contained in:
Johannes Meyer 2015-07-21 16:37:21 +02:00
parent 7c89887773
commit 93fbb0231c
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,16 +326,34 @@
} }
} }
this.redirectToUrl(redirect, req.$target, req.getResponseHeader('X-Icinga-Rerender-Layout'));
return true;
},
/**
* Redirect to the given url
*
* @param {string} url
* @param {object} $target
* @param {boolean} rerenderLayout
*/
redirectToUrl: function (url, $target, rerenderLayout) {
var icinga = this.icinga;
if (typeof rerenderLayout === 'undefined') {
rerenderLayout = false;
}
icinga.logger.debug( icinga.logger.debug(
'Got redirect for ', req.$target, ', URL was ' + redirect 'Got redirect for ', $target, ', URL was ' + url
); );
if (req.getResponseHeader('X-Icinga-Rerender-Layout')) { if (rerenderLayout) {
var parts = redirect.split(/#!/); var parts = url.split(/#!/);
redirect = parts.shift(); url = parts.shift();
var redirectionUrl = this.addUrlFlag(redirect, 'renderLayout'); var redirectionUrl = this.addUrlFlag(url, 'renderLayout');
var r = this.loadUrl(redirectionUrl, $('#layout')); var r = this.loadUrl(redirectionUrl, $('#layout'));
r.url = redirect; r.url = url;
if (parts.length) { if (parts.length) {
r.loadNext = parts; r.loadNext = parts;
} else if (!! document.location.hash) { } else if (!! document.location.hash) {
@ -345,28 +363,24 @@
r.loadNext = parts; r.loadNext = parts;
} }
} }
} else { } else {
if (url.match(/#!/)) {
if (redirect.match(/#!/)) { var parts = url.split(/#!/);
var parts = redirect.split(/#!/);
icinga.ui.layout2col(); icinga.ui.layout2col();
this.loadUrl(parts.shift(), $('#col1')); this.loadUrl(parts.shift(), $('#col1'));
this.loadUrl(parts.shift(), $('#col2')); this.loadUrl(parts.shift(), $('#col2'));
} else { } else {
if ($target.attr('id') === 'col2') { // TODO: multicol
if (req.$target.attr('id') === 'col2') { // TODO: multicol if ($('#col1').data('icingaUrl').split('?')[0] === url.split('?')[0]) {
if ($('#col1').data('icingaUrl').split('?')[0] === redirect.split('?')[0]) {
icinga.ui.layout1col(); icinga.ui.layout1col();
req.$target = $('#col1'); $target = $('#col1');
delete(this.requests['col2']); delete(this.requests['col2']);
} }
} }
this.loadUrl(redirect, req.$target); this.loadUrl(url, $target);
} }
} }
return true;
}, },
cacheLoadedIcons: function($container) { cacheLoadedIcons: function($container) {