Fixed #1942 but running jQuery.css() before jQuery.curCSS(). This way when the prope...

diff --git a/src/core.js b/src/core.js
index b9d5247146298cb4577e08af02525cbb828d63d9..b701abea991389e28a9f27a4bd3ec64ad16f97d5 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -755,7 +755,7 @@ jQuery.extend({
                        elem.style[ name ] = elem.style[ "old" + name ];
        },
 
-       css: function( elem, name ) {
+       css: function( elem, name, force ) {
                if ( name == "height" || name == "width" ) {
                        var old = {}, height, width;
 
@@ -805,7 +805,7 @@ jQuery.extend({
                                width;
                }
 
-               return jQuery.curCSS( elem, name );
+               return jQuery.curCSS( elem, name, force );
        },
 
        curCSS: function( elem, name, force ) {

diff --git a/src/fx.js b/src/fx.js
index e4c1015611948bde659ceb1b972829e2adcf4473..9bfe99962a3220606587e1dd9cc5c4ec602b9556 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -254,8 +254,8 @@ jQuery.fx.prototype = {
                if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
                        return this.elem[ this.prop ];
 
-               var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
-               return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+               var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+               return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
        },
 
        // Start an animation from one number to another