From fbc852ebc40b0f0b51a23c09878557aed34372f5 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 30 Mar 2010 19:33:55 +0200
Subject: [PATCH] Run the effects for showing the overlay and dialog in
 parallel. Make effect duration configurable.

---
 horde/js/redbox.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/horde/js/redbox.js b/horde/js/redbox.js
index 2ae9947a3..c7c0d6b59 100644
--- a/horde/js/redbox.js
+++ b/horde/js/redbox.js
@@ -8,6 +8,7 @@
 var RedBox = {
 
     overlay: true,
+    duration: 0.4,
     onDisplay: null,
 
     showInline: function(id)
@@ -25,19 +26,25 @@ var RedBox = {
     appearWindow: function()
     {
         var loading = $('RB_loading'),
-            opts = { duration: 0.4, queue: 'end' };
+            opts = { queue: 'end' },
+            effects = [], effect;
 
         if (loading && loading.visible()) {
             loading.hide();
         } else {
-            this.showOverlay();
+            effect = this.showOverlay(true);
+            if (effect) {
+                effects.push(effect);
+            }
         }
 
         if (this.onDisplay) {
             opts.afterFinish = this.onDisplay;
         }
 
-        $('RB_window').appear(opts).scrollTo();
+        effects.push(new Effect.Appear($('RB_window'), { sync: true, duration: this.duration }));
+        new Effect.Parallel(effects, opts);
+        $('RB_window').scrollTo();
     },
 
     loading: function()
@@ -53,13 +60,13 @@ var RedBox = {
 
     close: function()
     {
-        $('RB_window').fade({ duration: 0.4 });
+        $('RB_window').fade({ duration: this.duration });
         if (this.overlay && this.overlayVisible()) {
-            $('RB_overlay').fade({ duration: 0.4 });
+            $('RB_overlay').fade({ duration: this.duration });
         }
     },
 
-    showOverlay: function()
+    showOverlay: function(sync)
     {
         var rb = $('RB_redbox'), ov;
 
@@ -77,7 +84,7 @@ var RedBox = {
 
         if (this.overlay) {
             this.setOverlaySize();
-            $('RB_overlay').appear({ duration: 0.4, to: 0.6, queue: 'end' });
+            return new Effect.Appear($('RB_overlay'), { sync: sync, duration: this.duration, to: 0.6, queue: sync ? 'parallel' : 'end' });
         }
     },
 
-- 
2.11.0