From e7371b0d667e8c1ea17d1cbfc3b45e0e85513da2 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 5 Apr 2016 21:57:10 +0000
Subject: [PATCH] Keep loading prompt up until there's events too

---
 calendar/js/app.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 2d77339fba..2dfaa30408 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2828,6 +2828,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 				if(!multiple_owner) break;
 			}
 		}
+
+		egw.loading_prompt(this.appname,false);
 	},
 
 	/**
@@ -3280,7 +3282,13 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 		{
 			$j(window).trigger('resize');
 			this.setState({state:this.state});
-			egw.loading_prompt(this.appname,false);
+			
+			// Hide loader after 1 second as a fallback, it will also be hidden
+			// after loading is complete.
+			window.setTimeout(jQuery.proxy(function() {
+				egw.loading_prompt(this.appname,false);
+			}, this),1000);
+			
 		}
 	},