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

Make sure that the CSS hook getter isn't called if a forced computed style is done.

Browse source
This commit is contained in:
jeresig 2010-09-09 16:26:30 -04:00
parent 70377a65e2
commit c36596ea58
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/css.js
View file

@ -71,11 +71,10 @@ jQuery.extend({
} }
} else { } else {
if ( "get" in hooks && (ret = hooks.get( elem, force, extra )) !== undefined ) { if ( !force && "get" in hooks && (ret = hooks.get( elem, force, extra )) !== undefined ) {
return ret; return ret;
}
if ( !force && style && style[ name ] ) { } else if ( !force && style[ name ] ) {
ret = style[ name ]; ret = style[ name ];
} else if ( curCSS ) { } else if ( curCSS ) {
@ -214,14 +213,14 @@ function getWH( elem, name, extra ) {
jQuery.each( which, function() { jQuery.each( which, function() {
if ( !extra ) { if ( !extra ) {
val -= parseFloat(jQuery.css( elem, "padding" + this, undefined, true)) || 0; val -= parseFloat(jQuery.css( elem, "padding" + this, undefined, true )) || 0;
} }
if ( extra === "margin" ) { if ( extra === "margin" ) {
val += parseFloat(jQuery.css( elem, "margin" + this, undefined, true)) || 0; val += parseFloat(jQuery.css( elem, "margin" + this, undefined, true )) || 0;
} else { } else {
val -= parseFloat(jQuery.css( elem, "border" + this + "Width", undefined, true)) || 0; val -= parseFloat(jQuery.css( elem, "border" + this + "Width", undefined, true )) || 0;
} }
}); });