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

Fix formatting of pull 325. Fixes #4146.

1.7/enhancement_8685
jeresig 2011-04-14 15:49:15 -04:00
parent cdb02d09f1
commit 84712bd624
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/css.js
View File

@ -9,6 +9,7 @@ var ralpha = /alpha\([^)]*\)/i,
rnum = /^-?\d/,
rrelNum = /^[+\-]=/,
rrelNumFilter = /[^+\-\.\de]+/g,
rinputbutton = /input|button/i,
cssShow = { position: "absolute", visibility: "hidden", display: "block" },
cssWidth = [ "Left", "Right" ],
@ -338,39 +339,45 @@ curCSS = getComputedStyle || currentStyle;
function getWH( elem, name, extra ) {
var which = name === "width" ? cssWidth : cssHeight,
cur = curCSS(elem, name),
// We're addressing the way Firefox handles certain inputs and buttons, offsetWidth/height actually returns a normal width/height
ff = /input|button/i.test( elem.tagName.toLowerCase() ) && curCSS( elem, '-moz-box-sizing' ) === 'border-box';
cur = curCSS( elem, name ),
// 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";
// IE will return auto if we try to grab a width/height that is not set
if( ff || cur === 'auto') {
if ( boxSizing || cur === "auto" ) {
cur = name === "width" ? elem.offsetWidth : elem.offsetHeight;
}
// Fixes an IE7 effects test. "Chain show hide" was returning "scroll" instead of "visible"
if( name == "height" ){
// Make sure that IE7 returns the correct computed value for display
if ( name === "height" ) {
elem.offsetHeight;
}
var val = parseFloat(cur) || 0;
var val = parseFloat( cur ) || 0;
if ( extra ) {
for( var i = 0, len = which.length; i < len ; i++ ) {
for ( var i = 0, len = which.length; i < len ; i++ ) {
var dir = which[i];
// outerWidth/height
if ( extra === "border" || extra === 'margin' ) {
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' ) {
if ( extra == "margin" ) {
val += parseFloat(jQuery.css( elem, "margin" + dir )) || 0;
}
}
// innerWidth/height
else {
} else {
val += parseFloat(jQuery.css( elem, "padding" + dir )) || 0;
}
}
}
return val;
}