mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Added fix to stop height/width of auto from occurring when only opacity was being modified.
This commit is contained in:
parent
fc26b57ace
commit
56992c6ad9
6
fx/fx.js
6
fx/fx.js
@ -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");
|
||||||
|
if ( ty != "opacity" ) {
|
||||||
$.setAuto( z.el, "height" );
|
$.setAuto( z.el, "height" );
|
||||||
$.setAuto( z.el, "width" );
|
$.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);};
|
||||||
|
Loading…
Reference in New Issue
Block a user