Skip to content

J
jquery
Commit e0a4aa41 authored by Mike Sherov's avatar Mike Sherov Committed by Dave Methvin
Browse files
Options

use for loop instead of jQuery.each in getWH()

parent 774eba33
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
src/css.js
View file @ e0a4aa41
...@@ -327,20 +327,22 @@ function getWH( elem, name, extra ) { ...@@ -327,20 +327,22 @@ function getWH( elem, name, extra ) {
// Start with offset property // Start with offset property
var val = name === "width" ? elem.offsetWidth : elem.offsetHeight, var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
which = name === "width" ? cssWidth : cssHeight; which = name === "width" ? cssWidth : cssHeight,
i = 0,
len = which.length;
if ( val > 0 ) { if ( val > 0 ) {
if ( extra !== "border" ) { if ( extra !== "border" ) {
jQuery.each( which, function() { for ( ; i < len; i++ ) {
if ( !extra ) { if ( !extra ) {
val -= parseFloat( jQuery.css( elem, "padding" + this ) ) || 0; val -= parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
} }
if ( extra === "margin" ) { if ( extra === "margin" ) {
val += parseFloat( jQuery.css( elem, extra + this ) ) || 0; val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
} else { } else {
val -= parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0; val -= parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
} }
}); }
} }
return val + "px"; return val + "px";
...@@ -356,15 +358,15 @@ function getWH( elem, name, extra ) { ...@@ -356,15 +358,15 @@ function getWH( elem, name, extra ) {
// Add padding, border, margin // Add padding, border, margin
if ( extra ) { if ( extra ) {
jQuery.each( which, function() { for ( ; i < len; i++ ) {
val += parseFloat( jQuery.css( elem, "padding" + this ) ) || 0; val += parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
if ( extra !== "padding" ) { if ( extra !== "padding" ) {
val += parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0; val += parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
} }
if ( extra === "margin" ) { if ( extra === "margin" ) {
val += parseFloat( jQuery.css( elem, extra + this ) ) || 0; val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
} }
}); }
} }
return val + "px"; return val + "px";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment