X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..6e39d509471fe9b4e2660e0d1631b350d0c66f40:/docs/source/Fx.html
diff --git a/docs/source/Fx.html b/docs/source/Fx.html
index 8db99a1b..1aeb3728 100644
--- a/docs/source/Fx.html
+++ b/docs/source/Fx.html
@@ -1,5 +1,6 @@
+
The source code
@@ -97,7 +98,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
* being operated upon is passed as the first parameter.
*
- * @cfg {Object} scope The scope of the {@link #callback} function
+ * @cfg {Object} scope The scope (this reference) in which the {@link #callback} function is executed. Defaults to the browser window.
*
* @cfg {String} easing A valid Ext.lib.Easing value for the effect:
*
backBoth
@@ -571,9 +572,9 @@ el.frame("C3DAF9", 1, {
active;
me.queueFx(o, function(){
- color = color || "#C3DAF9"
+ color = color || '#C3DAF9';
if(color.length == 6){
- color = "#" + color;
+ color = '#' + color;
}
count = count || 1;
fly(dom).show();
@@ -583,10 +584,9 @@ el.frame("C3DAF9", 1, {
queue = function(){
proxy = fly(document.body || document.documentElement).createChild({
style:{
- visbility: HIDDEN,
position : ABSOLUTE,
- "z-index": 35000, // yee haw
- border : "0px solid " + color
+ 'z-index': 35000, // yee haw
+ border : '0px solid ' + color
}
});
return proxy.queueFx({}, animFn);
@@ -1005,7 +1005,7 @@ el.ghost('b', {
/* @private */
queueFx : function(o, fn){
- var me = this;
+ var me = fly(this.dom);
if(!me.hasFxBlock()){
Ext.applyIf(o, me.fxDefaults);
if(!o.concurrent){
@@ -1054,7 +1054,8 @@ el.ghost('b', {
fly(dom).clearPositioning();
fly(dom).setPositioning(pos);
if(!o.wrap){
- wrap.parentNode.insertBefore(dom, wrap);
+ var pn = fly(wrap).dom.parentNode;
+ pn.insertBefore(dom, wrap);
fly(wrap).remove();
}
},
@@ -1068,8 +1069,7 @@ el.ghost('b', {
/* @private */
afterFx : function(o){
var dom = this.dom,
- id = dom.id,
- notConcurrent = !o.concurrent;
+ id = dom.id;
if(o.afterStyle){
fly(dom).setStyle(o.afterStyle);
}
@@ -1079,13 +1079,11 @@ el.ghost('b', {
if(o.remove == TRUE){
fly(dom).remove();
}
- if(notConcurrent){
- getQueue(id).shift();
- }
if(o.callback){
o.callback.call(o.scope, fly(dom));
}
- if(notConcurrent){
+ if(!o.concurrent){
+ getQueue(id).shift();
fly(dom).nextFx();
}
},
@@ -1113,6 +1111,7 @@ Ext.Fx.resize = Ext.Fx.scale;
//When included, Ext.Fx is automatically applied to Element so that all basic
//effects are available directly via the Element API
Ext.Element.addMethods(Ext.Fx);
-})();
+})();
+
\ No newline at end of file