Changeset 3958

Timestamp:

11/27/07 23:58:07 (8 months ago)

Author:

davidserduke

Message:

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.

Location:

trunk/jquery/src

Files:

• core.js (modified) (2 diffs)
• fx.js (modified) (1 diff)

trunk/jquery/src/core.js

@@ -756 +756 @@
     },
 
-    css: function( elem, name ) {
+    css: function( elem, name, force ) {
         if ( name == "height" || name == "width" ) {
             var old = {}, height, width;
@@ -806 +806 @@
         }
 
-        return jQuery.curCSS( elem, name );
+        return jQuery.curCSS( elem, name, force );
     },
 

trunk/jquery/src/fx.js

@@ -255 +255 @@
             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;
     },