Upgrade to ExtJS 3.0.3 - Released 10/11/2009

[extjs.git] / src / core / core / Fx.js

diff --git a/src/core/core/Fx.js b/src/core/core/Fx.js
index c126a9d..aa77dab 100644 (file)
--- a/src/core/core/Fx.js
+++ b/src/core/core/Fx.js
@@ -1,5 +1,5 @@
 /*!
- * Ext JS Library 3.0.0
+ * Ext JS Library 3.0.3
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
@@ -96,7 +96,7 @@ br     The bottom right corner
  * The callback is intended for any additional code that should run once a particular effect has completed. The Element\r
  * being operated upon is passed as the first parameter.\r
  * \r
- * @cfg {Object} scope The scope of the <tt>{@link #callback}</tt> function\r
+ * @cfg {Object} scope The scope (<code>this</code> reference) in which the <tt>{@link #callback}</tt> function is executed. Defaults to the browser window.\r
  * \r
  * @cfg {String} easing A valid Ext.lib.Easing value for the effect:</p><div class="mdetail-params"><ul>\r
  * <li><b><tt>backBoth</tt></b></li>\r
@@ -570,9 +570,9 @@ el.frame("C3DAF9", 1, {
             active;\r
 \r
         me.queueFx(o, function(){\r
-            color = color || "#C3DAF9"\r
+            color = color || '#C3DAF9'\r
             if(color.length == 6){\r
-                color = "#" + color;\r
+                color = '#' + color;\r
             }            \r
             count = count || 1;\r
             fly(dom).show();\r
@@ -582,10 +582,9 @@ el.frame("C3DAF9", 1, {
                 queue = function(){\r
                     proxy = fly(document.body || document.documentElement).createChild({\r
                         style:{\r
-                            visbility: HIDDEN,\r
                             position : ABSOLUTE,\r
-                            "z-index": 35000, // yee haw\r
-                            border : "0px solid " + color\r
+                            'z-index': 35000, // yee haw\r
+                            border : '0px solid ' + color\r
                         }\r
                     });\r
                     return proxy.queueFx({}, animFn);\r
@@ -1004,7 +1003,7 @@ el.ghost('b', {
 \r
     /* @private */\r
     queueFx : function(o, fn){\r
-        var me = this;\r
+        var me = fly(this.dom);\r
         if(!me.hasFxBlock()){\r
             Ext.applyIf(o, me.fxDefaults);\r
             if(!o.concurrent){\r
@@ -1053,7 +1052,8 @@ el.ghost('b', {
         fly(dom).clearPositioning();\r
         fly(dom).setPositioning(pos);\r
         if(!o.wrap){\r
-            wrap.parentNode.insertBefore(dom, wrap);\r
+            var pn = fly(wrap).dom.parentNode;
+            pn.insertBefore(dom, wrap); \r
             fly(wrap).remove();\r
         }\r
     },\r
@@ -1067,8 +1067,7 @@ el.ghost('b', {
     /* @private */\r
     afterFx : function(o){\r
         var dom = this.dom,\r
-            id = dom.id,\r
-            notConcurrent = !o.concurrent;\r
+            id = dom.id;\r
         if(o.afterStyle){\r
             fly(dom).setStyle(o.afterStyle);            \r
         }\r
@@ -1078,13 +1077,11 @@ el.ghost('b', {
         if(o.remove == TRUE){\r
             fly(dom).remove();\r
         }\r
-        if(notConcurrent){\r
-            getQueue(id).shift();\r
-        }\r
         if(o.callback){\r
             o.callback.call(o.scope, fly(dom));\r
         }\r
-        if(notConcurrent){\r
+        if(!o.concurrent){\r
+            getQueue(id).shift();\r
             fly(dom).nextFx();\r
         }\r
     },\r
@@ -1112,4 +1109,4 @@ Ext.Fx.resize = Ext.Fx.scale;
 //When included, Ext.Fx is automatically applied to Element so that all basic\r
 //effects are available directly via the Element API\r
 Ext.Element.addMethods(Ext.Fx);\r
-})();
\ No newline at end of file
+})();