Skip to content

Commit 935df49

Browse files
mikesherovdmethvin
authored andcommitted
Followup for #7986 to fix a botched merge.
Okay, Jenkins, you were right this time.
1 parent 92cd999 commit 935df49

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/support.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jQuery.support = (function() {
9494
pixelMargin: true
9595
};
9696

97-
//jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
98-
jQuery.boxModel = support.boxModel = document.compatMode === "CSS1Compat";
97+
// jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
98+
jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
9999

100100
// Make sure checked status is properly cloned
101101
input.checked = true;
@@ -239,11 +239,6 @@ jQuery.support = (function() {
239239
( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
240240
}
241241

242-
// Figure out if the W3C box model works as expected
243-
div.innerHTML = "";
244-
div.style.width = div.style.paddingLeft = "1px";
245-
jQuery.boxModel = support.boxModel = div.offsetWidth === 2;
246-
247242
if ( typeof div.style.zoom !== "undefined" ) {
248243
// Check if natively block-level elements act like inline-block
249244
// elements when setting their display to 'inline' and giving

0 commit comments

Comments
 (0)