From 75eff8e0f70758588afc19ab1600f45fc6756e54 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 14 Nov 2013 14:35:54 +0200
Subject: web client: revert to parent view also when module does not use tabs

---
 web/client.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/web/client.js b/web/client.js
index c3b68a3..1c5ffae 100644
--- a/web/client.js
+++ b/web/client.js
@@ -1069,8 +1069,10 @@ $(function() {
 	    var layouts = {stacked: Stacked, tabular: Tabular};
 
 
+	    function redirect(path) { $.bbq.pushState("#" + path); }
+
 	    function renderObject(path, data) {
-		var path = path || $.param.fragment();
+		path = path || $.param.fragment();
 
 		return (
 		    data ? $.Deferred().resolve(data) : txnMgr.query(path)
@@ -1099,12 +1101,15 @@ $(function() {
 			true,
 			false
 		    );
+		}).fail(function() {
+		    var comps = split(path);
+		    comps.pop();
+		    comps.unshift("/");
+		    redirect(join.apply(undefined, comps));
 		});
 	    };
 
 
-	    function redirect(path) { $.bbq.pushState("#" + path); }
-
 	    function render() {
 		var path = $.param.fragment();
 
@@ -1157,13 +1162,7 @@ $(function() {
 
 		    renderMenu(tabs, "/" + comps[0], comps[1], true)
 			.done(function(first) {
-			    renderObject(
-				topLevel ? join(path, first) : path
-			    ).fail(function() {
-				comps.pop();
-				comps.unshift("/");
-				redirect(join.apply(undefined, comps));
-			    });
+			    renderObject(topLevel ? join(path, first) : path);
 			})
 			.fail(function(data) {
 			    renderObject(path, topLevel ? data : null);
-- 
cgit v1.2.3