From 56a9692da45d8243869eaf5aa811d03b3496dadd Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 18 Sep 2012 15:04:14 -0400
Subject: [PATCH] Single-window mode: fixed closing of popup window

---
 UI/WebServerResources/generic.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index af1a7b620..7b18a6354 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1665,10 +1665,12 @@ function onCloseButtonClick(event) {
         Event.stop(event);
 
     if (window.frameElement && window.frameElement.id) {
-        jQuery(parent$("bgFrameDiv")).fadeOut('fast');
-        var div = parent$("popupFrame");
-        div.hide();
-        div.down("iframe").src = "/SOGo/loading";
+        var bgDiv = parent$("bgFrameDiv");
+        jQuery(bgDiv).fadeOut('fast', function(event) {
+            var div = parent$("popupFrame");
+            div.hide();
+            div.down("iframe").src = "/SOGo/loading";
+        });
     }
     else {
         window.close();