From: David Serduke <davidserduke@gmail.com>
Date: Tue, 27 Nov 2007 23:58:07 +0000 (+0000)
Subject: Fixed #1942 but running jQuery.css() before jQuery.curCSS().  This way when the prope... 
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=2ccd2cb36be6169afee3bd6e82ba3539f432c73f;p=jquery.git

Fixed #1942 but running jQuery.css() before jQuery.curCSS().  This way when the property is width or height it gets the values through calculation instead of just css first. This appears to fix the problem in Opera without hurting any of the other browsers.
---

diff --git a/src/core.js b/src/core.js
index b9d5247..b701abe 100644
--- 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 e4c1015..9bfe999 100644
--- 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