deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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.

Browse source
This commit is contained in:
David Serduke 2007-11-27 23:58:07 +00:00
parent b26da08821
commit 2ccd2cb36b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core.js
View file

@ -755,7 +755,7 @@ jQuery.extend({
elem.style[ name ] = elem.style[ "old" + name ]; elem.style[ name ] = elem.style[ "old" + name ];
}, },
css: function( elem, name ) { css: function( elem, name, force ) {
if ( name == "height" || name == "width" ) { if ( name == "height" || name == "width" ) {
var old = {}, height, width; var old = {}, height, width;
@ -805,7 +805,7 @@ jQuery.extend({
width; width;
} }
return jQuery.curCSS( elem, name ); return jQuery.curCSS( elem, name, force );
}, },
curCSS: function( elem, name, force ) { curCSS: function( elem, name, force ) {

4
src/fx.js
View file

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