git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Started work on new attr plugin - will provide a ton of accessors for common styles...
[jquery.git]
/
fx
/
fx.js
diff --git
a/fx/fx.js
b/fx/fx.js
index
9432538
..
0a8afbb
100644
(file)
--- a/
fx/fx.js
+++ b/
fx/fx.js
@@
-112,8
+112,10
@@
function fx(el,op,ty,tz){
setTimeout(function(){
y.overflow = z.oo;
if(y.height=="0px"||y.width=="0px")z.ss("none");
setTimeout(function(){
y.overflow = z.oo;
if(y.height=="0px"||y.width=="0px")z.ss("none");
- $.setAuto( z.el, "height" );
- $.setAuto( z.el, "width" );
+ if ( ty != "opacity" ) {
+ $.setAuto( z.el, "height" );
+ $.setAuto( z.el, "width" );
+ }
if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();}
},13);
} else
if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();}
},13);
} else
@@
-166,9
+168,9
@@
fx.Resize = function(e,o){
};
fx.FadeSize = function(e,o){
var z = this;
};
fx.FadeSize = function(e,o){
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(){
var j = fx.fn[i];
z[j] = function(a,b){p[j]();r[j](a,b);};
for(var i in fx.fn){(function(){
var j = fx.fn[i];
z[j] = function(a,b){p[j]();r[j](a,b);};