From 861476eb3fb5e378fdbb4e86e4737daf6de27f13 Mon Sep 17 00:00:00 2001 From: Mike Petrovich Date: Tue, 16 Oct 2012 12:22:31 -0400 Subject: [PATCH] Fixes #11635, Explicit overflow:auto is overridden by inline overflow:hidden during animation, closes gh-981 --- src/sizzle | 2 +- src/support.js | 2 +- test/data/support/shrinkWrapBlocks.html | 23 +++++++++++++++++++++++ test/unit/support.js | 5 +++++ 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 test/data/support/shrinkWrapBlocks.html diff --git a/src/sizzle b/src/sizzle index f69014414..3ed4e970e 160000 --- a/src/sizzle +++ b/src/sizzle @@ -1 +1 @@ -Subproject commit f690144148d95adc867fa2a7e25be0e05eb2ecc7 +Subproject commit 3ed4e970e262230c799eaf24cc6d889828a3d6f3 diff --git a/src/support.js b/src/support.js index f998f1270..7629c38e7 100644 --- 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 ) { diff --git a/test/data/support/shrinkWrapBlocks.html b/test/data/support/shrinkWrapBlocks.html new file mode 100644 index 000000000..af1493937 --- /dev/null +++ b/test/data/support/shrinkWrapBlocks.html @@ -0,0 +1,23 @@ + + + + + + + +

+ +

+ + + diff --git a/test/unit/support.js b/test/unit/support.js index 57378a021..fed13c7dd 100644 --- 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, -- 2.39.5