Skip to content
Permalink
Browse files

Followup for #7986 to fix a botched merge.

Okay, Jenkins, you were right this time.
  • Loading branch information...
mikesherov authored and dmethvin committed Mar 3, 2012
1 parent 92cd999 commit 935df49d77c9719b12e28b07e1c26bcf8a5ab6a7
Showing with 2 additions and 7 deletions.
  1. +2 −7 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

0 comments on commit 935df49

Please sign in to comment.
You can’t perform that action at this time.