js/loader: support multi-container redirection

Redirections to #!-separated URLs (multiple containers) should also work when not re-rendering the whole layout.
Icinga · Nov 1, 2014 · 95f9beb · 95f9beb
1 parent 6298d30
commit 95f9beb
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
@@ -269,15 +269,24 @@
                 }
 
             } else {
-                if (req.$target.attr('id') === 'col2') { // TODO: multicol
-                    if ($('#col1').data('icingaUrl') === redirect) {
-                        icinga.ui.layout1col();
-                        req.$target = $('#col1');
-                        delete(this.requests['col2']);
+
+                if (redirect.match(/#!/)) {
+                    var parts = redirect.split(/#!/);
+                    icinga.ui.layout2col();
+                    this.loadUrl(parts.shift(), $('#col1'));
+                    this.loadUrl(parts.shift(), $('#col2'));
+                } else {
+
+                    if (req.$target.attr('id') === 'col2') { // TODO: multicol
+                        if ($('#col1').data('icingaUrl') === redirect) {
+                            icinga.ui.layout1col();
+                            req.$target = $('#col1');
+                            delete(this.requests['col2']);
+                        }
                     }
-                }
 
-                this.loadUrl(redirect, req.$target);
+                    this.loadUrl(redirect, req.$target);
+                }
             }
             return true;
         },