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

Made some code tweaks related to running jQuery through JSLint (thanks to Lorin Larson for the JSLint run).

Browse source
This commit is contained in:
jeresig 2010-03-01 12:44:56 -05:00
parent 5353c6bcc3
commit a18f682012
5 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/css.js
View file

@ -82,32 +82,13 @@ jQuery.extend({
css: function( elem, name, force, extra ) {
if ( name === "width" || name === "height" ) {
var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
function getWH() {
val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
if ( extra === "border" ) {
return;
}
jQuery.each( which, function() {
if ( !extra ) {
val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
}
if ( extra === "margin" ) {
val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
} else {
val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
}
});
}
if ( elem.offsetWidth !== 0 ) {
getWH();
val = getWH( elem, name, extra );
} else {
jQuery.swap( elem, props, getWH );
jQuery.swap( elem, cssShow, function() {
val = getWH( elem, name, extra );
});
}
return Math.max(0, Math.round(val));
@ -211,6 +192,30 @@ jQuery.extend({
}
});
function getWH( elem, name, extra ) {
var which = name === "width" ? cssWidth : cssHeight,
val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
if ( extra === "border" ) {
return val;
}
jQuery.each( which, function() {
if ( !extra ) {
val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
}
if ( extra === "margin" ) {
val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
} else {
val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
}
});
return val;
}
if ( jQuery.expr && jQuery.expr.filters ) {
jQuery.expr.filters.hidden = function( elem ) {
var width = elem.offsetWidth, height = elem.offsetHeight,