Fixed height/width issues that happend due to the box model, in $.css().

[jquery.git] / fx / fx.js

diff --git a/fx/fx.js b/fx/fx.js
index c7979fa..c7a0924 100644 (file)
--- a/fx/fx.js
+++ b/fx/fx.js
@@ -51,7 +51,7 @@ $.fn.fadeIn = function(a,o) {
 $.fn.fadeTo = function(a,ev,o) {
        o = $.speed(a,o);
        return a ? this.each(function(){
-               ef = new fx.Opacity(this,o);
+               ef = new $.fx.Opacity(this,o);
                ef.custom(ef.cur(),parseFloat(ev));
                ef.show();
        }) : this._show();
@@ -99,8 +99,8 @@ $.fx = function(el,op,ty,tz){
        z.el = el.constructor==String?document.getElementById(el):el;
        var y = z.el.style;
        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),10);};
+       z.max = function(){return z.el["io"+ty]||z.cur();};
+       z.cur = function(){return $.css(z.el,ty);};
        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;}};
@@ -173,7 +173,7 @@ $.fx.Resize = function(e,o){
        var h = new $.fx.Height(e,o);
        if(o) { o.onComplete = null; }
        var w = new $.fx.Width(e,o);
-       function c(a,b,d){return (!a||a==c||b==d);}
+       function c(a,b,d){return (!a||a==d||b==d);}
        for(var i in $.fx.fn){(function(){
                var j = $.fx.fn[i];
                z[j] = function(a,b){