diff options
| author | Chris Faulkner <thefaulkner@gmail.com> | 2012-07-11 09:46:21 -0400 |
|---|---|---|
| committer | Rick Waldron <waldron.rick@gmail.com> | 2012-07-11 09:46:21 -0400 |
| commit | 7b5ffcdac8e1cc4b110690cddc6345f44ae0aaab (patch) | |
| tree | 0a94bba47cd44ac6da50bb5bdefe4f804f733a86 /src/css.js | |
| parent | c210e08c3a73dca302afee24186b48f62ada9fba (diff) | |
| download | jquery-7b5ffcdac8e1cc4b110690cddc6345f44ae0aaab.tar.gz jquery-7b5ffcdac8e1cc4b110690cddc6345f44ae0aaab.zip | |
Fixes a variety of typographical problems. Closes gh-853
Diffstat (limited to 'src/css.js')
| -rw-r--r-- | src/css.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/css.js b/src/css.js index 2b756c392..6c43be399 100644 --- a/src/css.js +++ b/src/css.js @@ -374,15 +374,15 @@ function augmentWidthOrHeight( elem, name, extra, isBorderBox ) { val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0; } - // at this point, extra isnt border nor margin, so remove border + // at this point, extra isn't border nor margin, so remove border if ( extra !== "margin" ) { val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0; } } else { - // at this point, extra isnt content, so add padding + // at this point, extra isn't content, so add padding val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0; - // at this point, extra isnt content nor padding, so add border + // at this point, extra isn't content nor padding, so add border if ( extra !== "padding" ) { val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0; } |