From 8df7c00b2112778cab93417a709df02c35b26b3a Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 6 Apr 2016 15:19:24 +0000
Subject: [PATCH] Do not show loading prompt for popups

---
 calendar/js/app.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 2dfaa30408..5004de245b 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -91,16 +91,18 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 			window.app.calendar = window.top.app.calendar;
 			return;
 		}
+		else if (window.top == window && !egw(window).is_popup())
+		{
+			// Show loading div
+			egw.loading_prompt(
+				this.appname,true,egw.lang('please wait...'),
+				framework.applications.calendar.tab.contentDiv,
+				egwIsMobile()?'horizental':'spinner'
+			);
+		}
 
 		// call parent
 		this._super.apply(this, arguments);
-		
-		// Show loading div
-		egw.loading_prompt(
-			this.appname,true,egw.lang('please wait...'),
-			framework.applications.calendar.tab.contentDiv,
-			egwIsMobile()?'horizental':'spinner'
-		);
 
 		// Scroll
 		jQuery(jQuery.proxy(this._scroll,this));