Skip to content
Permalink
Browse files

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

…:hidden during animation, closes gh-981
  • Loading branch information...
mpetrovich authored and mikesherov committed Oct 16, 2012
1 parent 69ce829 commit 861476eb3fb5e378fdbb4e86e4737daf6de27f13
Showing with 30 additions and 2 deletions.
  1. +1 −1 src/sizzle
  2. +1 −1 src/support.js
  3. +23 −0 test/data/support/shrinkWrapBlocks.html
  4. +5 −0 test/unit/support.js
Submodule sizzle updated 3 files
+74 −96 sizzle.js
+8 −43 test/unit/selector.js
+1 −44 test/unit/utilities.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 ) {
@@ -0,0 +1,23 @@
<!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>
@@ -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,

0 comments on commit 861476e

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