Skip to content

J
jquery
Commit 935df49d authored by Mike Sherov's avatar Mike Sherov Committed by Dave Methvin
Browse files
Options

Followup for #7986 to fix a botched merge. 

Okay, Jenkins, you were right this time.
parent 92cd9990
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
src/support.js
View file @ 935df49d
...@@ -94,8 +94,8 @@ jQuery.support = (function() { ...@@ -94,8 +94,8 @@ jQuery.support = (function() {
pixelMargin: true pixelMargin: true
}; };
//jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead // jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
jQuery.boxModel = support.boxModel = document.compatMode === "CSS1Compat"; jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
// Make sure checked status is properly cloned // Make sure checked status is properly cloned
input.checked = true; input.checked = true;
...@@ -239,11 +239,6 @@ jQuery.support = (function() { ...@@ -239,11 +239,6 @@ jQuery.support = (function() {
( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; ( 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" ) { if ( typeof div.style.zoom !== "undefined" ) {
// Check if natively block-level elements act like inline-block // Check if natively block-level elements act like inline-block
// elements when setting their display to 'inline' and giving // elements when setting their display to 'inline' and giving
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment