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

revert to old code, bug is invalid

Browse source
This commit is contained in:
Jordan Boesch 2011-04-15 07:48:50 -06:00
parent 8e1467f97e
commit c4d0cccecf
2 changed files with 14 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/css.js
View file

@ -339,45 +339,24 @@ curCSS = getComputedStyle || currentStyle;
function getWH( elem, name, extra ) {
var which = name === "width" ? cssWidth : cssHeight,
cur = curCSS( elem, name ),
val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
// We're addressing the way Firefox handles certain inputs and buttons,
// offsetWidth/height actually returns a normal width/height
boxSizing = rinputbutton.test( elem.nodeName ) &&
( curCSS( elem, "-moz-box-sizing" ) === "border-box" ||
curCSS( elem, "box-sizing" ) === "border-box" );
// IE will return auto if we try to grab a width/height that is not set
if ( boxSizing || cur === "auto" ) {
cur = name === "width" ? elem.offsetWidth : elem.offsetHeight;
if ( extra === "border" ) {
return val;
}
// Make sure that IE7 returns the correct computed value for display
if ( name === "height" ) {
elem.offsetHeight;
}
var val = parseFloat( cur ) || 0;
if ( extra ) {
for ( var i = 0, len = which.length; i < len ; i++ ) {
var dir = which[i];
// outerWidth/height
if ( extra === "border" || extra === "margin" ) {
val += parseFloat(jQuery.css( elem, "border" + dir + "Width" )) || 0;
val += parseFloat(jQuery.css( elem, "padding" + dir )) || 0;
if ( extra == "margin" ) {
val += parseFloat(jQuery.css( elem, "margin" + dir )) || 0;
}
// innerWidth/height
} else {
val += parseFloat(jQuery.css( elem, "padding" + dir )) || 0;
}
jQuery.each( which, function() {
if ( !extra ) {
val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
}
}
if ( extra === "margin" ) {
val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
} else {
val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
}
});
return val;
}