Commit 2ccd2cb3 authored by David Serduke's avatar David Serduke

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

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.
parent b26da088
......@@ -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 ) {
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment