Added fix to stop height/width of auto from occurring when only opacity was being modified.

This commit is contained in:
John Resig 2006-04-08 06:34:04 +00:00
parent fc26b57ace
commit 56992c6ad9

View File

@ -112,8 +112,10 @@ function fx(el,op,ty,tz){
setTimeout(function(){ setTimeout(function(){
y.overflow = z.oo; y.overflow = z.oo;
if(y.height=="0px"||y.width=="0px")z.ss("none"); if(y.height=="0px"||y.width=="0px")z.ss("none");
$.setAuto( z.el, "height" ); if ( ty != "opacity" ) {
$.setAuto( z.el, "width" ); $.setAuto( z.el, "height" );
$.setAuto( z.el, "width" );
}
if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();} if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();}
},13); },13);
} else } else
@ -166,9 +168,9 @@ fx.Resize = function(e,o){
}; };
fx.FadeSize = function(e,o){ fx.FadeSize = function(e,o){
var z = this; var z = this;
var p = new fx.Opacity(e,o);
if(o) o.onComplete = null;
var r = new fx.Resize(e,o); var r = new fx.Resize(e,o);
if(o) o.onComplete = null;
var p = new fx.Opacity(e,o);
for(var i in fx.fn){(function(){ for(var i in fx.fn){(function(){
var j = fx.fn[i]; var j = fx.fn[i];
z[j] = function(a,b){p[j]();r[j](a,b);}; z[j] = function(a,b){p[j]();r[j](a,b);};