]> source.dussan.org Git - jquery.git/commitdiff
Followup for #7986 to fix a botched merge.
authorMike Sherov <mike.sherov@gmail.com>
Sat, 3 Mar 2012 00:21:24 +0000 (19:21 -0500)
committerDave Methvin <dave.methvin@gmail.com>
Sat, 3 Mar 2012 02:10:36 +0000 (21:10 -0500)
Okay, Jenkins, you were right this time.

src/support.js

index 3b64a49befc3a7d2b75b025d761a692ae3ad175e..baebaa2a00cf099ca744f8cebd7aec802dd6cde3 100644 (file)
@@ -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