Made it so that the height/width auto is only called when 'show' is executed.
[jquery.git] / fx / fx.js
index 6e48920..f74c19a 100644 (file)
--- a/fx/fx.js
+++ b/fx/fx.js
@@ -1,9 +1,94 @@
+$.speed = function(s,o) {
+       if ( o && o.constructor == Function ) o = { onComplete: o };
+       o = o || {};
+       var ss = {"crawl":1200,"xslow":850,"slow":600,"medium":400,"fast":200,"xfast":75,"normal":400};
+       o.duration = typeof s == "number" ? s : ss[s] || 400;
+       return o;
+};
+
+$.fn.hide = function(a,o) {
+       o = $.speed(a,o);
+       return a ? this.each(function(){
+               new fx.FadeSize(this,o).hide();
+       }) : this._hide();
+};
+
+$.fn.show = function(a,o) {
+       o = $.speed(a,o);
+       return a ? this.each(function(){
+               new fx.FadeSize(this,o).show();
+       }) : this._show();
+};
+
+$.fn.slideDown = function(a,o) {
+       o = $.speed(a,o);
+       return this.each(function(){
+               new fx.Resize(this,o).show("height");
+       });
+};
+
+$.fn.slideUp = function(a,o) {
+       o = $.speed(a,o);
+       return this.each(function(){
+               new fx.Resize(this,o).hide("height");
+       });
+};
+
+$.fn.fadeOut = function(a,o) {
+       o = $.speed(a,o);
+       return a ? this.each(function(){
+               new fx.Opacity(this,o).hide();
+       }) : this._hide();
+};
+
+$.fn.fadeIn = function(a,o) {
+       o = $.speed(a,o);
+       return a ? this.each(function(){
+               new fx.Opacity(this,o).show();
+       }) : this._show();
+};
+
+$.fn.center = function(f) {
+       return this.each(function(){
+               if ( !f && this.nodeName == 'IMG' &&
+                                !this.offsetWidth && !this.offsetHeight ) {
+                       var self = this;
+                       setTimeout(function(){
+                               $(self).center(true);
+                       }, 13);
+               } else {
+                       var s = this.style;
+                       var p = this.parentNode;
+                       if ( $.css(p,"position") == 'static' )
+                               p.style.position = 'relative';
+                       s.position = 'absolute';
+                       s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2) + "px";
+                       s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2) + "px";
+               }
+  });
+};
+
+$.setAuto = function(e,p) {
+       var a = e.style[p];
+       var o = $.css(e,p);
+       e.style[p] = 'auto';
+       var n = $.css(e,p);
+       if ( o != n )
+               e.style[p] = a;
+};
+
+/*
+ * I originally wrote fx() as a clone of moo.fx and in the process
+ * of making it small in size the code became illegible to sane 
+ * people. You've been warned.
+ */
+
 function fx(el,op,ty,tz){
        var z = this;
        z.a = function(){z.el.style[ty]=z.now+z.o.unit};
        z.max = function(){return z.el["io"+ty]||z.el["natural"+tz]||z.el["scroll"+tz]||z.cur()};
        z.cur = function(){return parseInt($.getCSS(z.el,ty))};
-       z.show = function(){z.ss("block");z.custom(0,z.max())};
+       z.show = function(){z.ss("block");z.o.auto=true;z.custom(0,z.max())};
        z.hide = function(){z.el.$o=$.getCSS(z.el,"overflow");z.el["io"+ty]=this.cur();z.custom(z.cur(),0)};
        z.ss = function(a){if(y.display!=a)y.display=a};
        z.toggle = function(){if(z.cur()>0)z.hide();else z.show()};
@@ -11,13 +96,13 @@ function fx(el,op,ty,tz){
        z.clear = function(){clearInterval(z.timer);z.timer=null};
        z.el = el.constructor==String?document.getElementById(el):el;
        var y = z.el.style;
-        z.oo = y.overflow;
+       z.oo = y.overflow;
        y.overflow = "hidden";
        z.o = {
-          unit: "px",
-          duration: (op && op.duration) || 400,
-          onComplete: (op && op.onComplete) || op
-        };
+               unit: "px",
+               duration: (op && op.duration) || 400,
+               onComplete: (op && op.onComplete) || op
+       };
        z.step = function(f,tt){
                var t = (new Date).getTime();
                var p = (t - z.s) / z.o.duration;
@@ -27,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");
-                               $.setAuto( z.el, "height" );
-                               $.setAuto( z.el, "width" );
+                               if ( ty != "opacity" && z.o.auto ) {
+                                       $.setAuto( z.el, "height" );
+                                       $.setAuto( z.el, "width" );
+                               }
                                if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();}
                        },13);
                } else
@@ -81,90 +168,11 @@ fx.Resize = function(e,o){
 };
 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);
+       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);};
        })()}
-};
-
-$.speed = function(s,o) {
-  if ( o && o.constructor == Function ) o = { onComplete: o };
-  o = o || {};
-  var ss = {"crawl":1200,"xslow":850,"slow":600,"medium":400,"fast":200,"xfast":75,"normal":400};
-  o.duration = typeof s == "number" ? s : ss[s] || 400;
-  return o;
-};
-
-$.fn.hide = function(a,o) {
-  o = $.speed(a,o);
-  return a ? this.each(function(){
-    new fx.FadeSize(this,o).hide();
-  }) : this._hide();
-};
-
-$.fn.show = function(a,o) {
-  o = $.speed(a,o);
-  return a ? this.each(function(){
-    new fx.FadeSize(this,o).show();
-  }) : this._show();
-};
-
-$.fn.slideDown = function(a,o) {
-  o = $.speed(a,o);
-  return this.each(function(){
-    new fx.Resize(this,o).show("height");
-  });
-};
-
-$.fn.slideUp = function(a,o) {
-  o = $.speed(a,o);
-  return this.each(function(){
-    new fx.Resize(this,o).hide("height");
-  });
-};
-
-$.fn.fadeOut = function(a,o) {
-  o = $.speed(a,o);
-  return a ? this.each(function(){
-    new fx.Opacity(this,o).hide();
-  }) : this._hide();
-};
-
-$.fn.fadeIn = function(a,o) {
-  o = $.speed(a,o);
-  return a ? this.each(function(){
-    new fx.Opacity(this,o).show();
-  }) : this._show();
-};
-
-$.fn.center = function(f) {
-  return this.each(function(){
-               if ( !f && this.nodeName == 'IMG' &&
-                                !this.offsetWidth && !this.offsetHeight ) {
-                       var self = this;
-                       setTimeout(function(){
-                               $(self).center(true);
-                       }, 13);
-               } else {
-                       var s = this.style;
-                       var p = this.parentNode;
-                       if ( $.css(p,"position") == 'static' )
-                               p.style.position = 'relative';
-                       s.position = 'absolute';
-                       s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2) + "px";
-                       s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2) + "px";
-               }
-  });
-};
-
-$.setAuto = function(e,p) {
-  var a = e.style[p];
-  var o = $.css(e,p);
-  e.style[p] = 'auto';
-  var n = $.css(e,p);
-  if ( o != n )
-    e.style[p] = a;
-};
+};
\ No newline at end of file