From ef7ab12d628cddf1cc504cd3c8f45b337776e155 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 21 Jun 2010 16:59:06 +0200
Subject: [PATCH] Need to load the next view also when returning early from
 go().

---
 kronolith/js/kronolith.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index 2d11a930c..64cb6c265 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -324,6 +324,7 @@ KronolithCore = {
                      (loc == 'week' && date.getRealWeek() == this.date.getRealWeek()) ||
                      ((loc == 'day'  || loc == 'agenda') && date.dateString() == this.date.dateString()))) {
                          this.addHistory(fullloc);
+                         this.loadNextView();
                          return;
                 }
 
@@ -358,9 +359,11 @@ KronolithCore = {
                 var tasktype = locParts.shift() || this.tasktype;
                 if (this.view == loc && this.tasktype == tasktype) {
                     this.addHistory(fullloc);
+                    this.loadNextView();
                     return;
                 }
                 if (!$w('all complete incomplete future').include(tasktype)) {
+                    this.loadNextView();
                     return;
                 }
 
@@ -405,6 +408,7 @@ KronolithCore = {
                 query = Object.toJSON({ title: term });
 
             if (!($w('all past future').include(time))) {
+                this.loadNextView();
                 return;
             }
 
@@ -468,6 +472,7 @@ KronolithCore = {
         case 'event':
             // Load view first if necessary.
             if (!this.view ) {
+                this.viewLoading.pop();
                 this.go(Kronolith.conf.login_view);
                 this.go.bind(this, fullloc, data).defer();
                 return;
@@ -510,6 +515,7 @@ KronolithCore = {
 
         case 'calendar':
             if (!this.view) {
+                this.viewLoading.pop();
                 this.go(Kronolith.conf.login_view);
                 this.go.bind(this, fullloc, data).defer();
                 return;
-- 
2.11.0