diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2012-03-02 19:21:24 -0500 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2012-03-02 21:10:36 -0500 |
| commit | 935df49d77c9719b12e28b07e1c26bcf8a5ab6a7 (patch) | |
| tree | 8b385ea7077d32615894d4c9453c251fd9b7e7e8 /src/support.js | |
| parent | 92cd9990971a097b6639607b0d1172e9fe6d0dca (diff) | |
| download | jquery-935df49d77c9719b12e28b07e1c26bcf8a5ab6a7.tar.gz jquery-935df49d77c9719b12e28b07e1c26bcf8a5ab6a7.zip | |
Followup for #7986 to fix a botched merge.
Okay, Jenkins, you were right this time.
Diffstat (limited to 'src/support.js')
| -rw-r--r-- | src/support.js | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/support.js b/src/support.js index 3b64a49be..baebaa2a0 100644 --- a/src/support.js +++ b/src/support.js @@ -94,8 +94,8 @@ jQuery.support = (function() { pixelMargin: true }; - //jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead - jQuery.boxModel = support.boxModel = document.compatMode === "CSS1Compat"; + // jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead + jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat"); // Make sure checked status is properly cloned input.checked = true; @@ -239,11 +239,6 @@ jQuery.support = (function() { ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; } - // Figure out if the W3C box model works as expected - div.innerHTML = ""; - div.style.width = div.style.paddingLeft = "1px"; - jQuery.boxModel = support.boxModel = div.offsetWidth === 2; - if ( typeof div.style.zoom !== "undefined" ) { // Check if natively block-level elements act like inline-block // elements when setting their display to 'inline' and giving |