Fixes #11635, Explicit overflow:auto is overridden by inline overflow:hidden...

Fixes #11635, Explicit overflow:auto is overridden by inline overflow:hidden during animation, closes gh-981

Fixes #11635, Explicit overflow:auto is overridden by inline overflow:hidden...
Fixes #11635, Explicit overflow:auto is overridden by inline overflow:hidden during animation, closes gh-981
861476eb · Mike Petrovich · Mike Sherov · 69ce829d · 3ed4e970 · 861476eb
Commit 861476eb authored Oct 16, 2012 by Mike Petrovich Committed by Mike Sherov Oct 16, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 30 additions and 2 deletions

sizzle src/sizzle +1 -1

support.js src/support.js +1 -1

shrinkWrapBlocks.html test/data/support/shrinkWrapBlocks.html +23 -0

support.js test/unit/support.js +5 -0

No files found.
--- a/sizzle @ 3ed4e970
+++ b/sizzle @ 3ed4e970
-Subproject commit f690144148d95adc867fa2a7e25be0e05eb2ecc7
+Subproject commit 3ed4e970e262230c799eaf24cc6d889828a3d6f3
--- a/src/support.js
+++ b/src/support.js
@@ -172,7 +172,7 @@ jQuery.support = (function() {
 	// Run tests that need a body at doc ready
 	jQuery(function() {
 		var container, div, tds, marginDiv,
-			divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;",
+			divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
 			body = document.getElementsByTagName("body")[0];
 		if ( !body ) {

--- a/test/data/support/shrinkWrapBlocks.html
+++ b/test/data/support/shrinkWrapBlocks.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" id="html">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<style>
+		* {
+			-webkit-box-sizing: border-box;
+			-moz-box-sizing:    border-box;
+			box-sizing:         border-box;
+		}
+	</style>
+</head>
+<body>
+	<div>
+		<script src="../../../dist/jquery.js"></script>
+	</div>
+	<script>
+		jQuery(function() {
+			window.parent.iframeCallback( jQuery.support.shrinkWrapBlocks );
+		});
+	</script>
+</body>
+</html>
--- a/test/unit/support.js
+++ b/test/unit/support.js
@@ -38,6 +38,11 @@ testIframeWithCallback( "A background on the testElement does not cause IE8 to c
 	ok( true, "IE8 does not crash" );
 });
+testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlocks", "support/shrinkWrapBlocks.html", function( shrinkWrapBlocks ) {
+	expect( 1 );
+	strictEqual( shrinkWrapBlocks, jQuery.support.shrinkWrapBlocks, "jQuery.support.shrinkWrapBlocks properties are the same" );
+});
 (function() {
 	var userAgent = window.navigator.userAgent,