diff options
| author | Mike Petrovich <michael.c.petrovich@gmail.com> | 2012-10-16 12:22:31 -0400 |
|---|---|---|
| committer | Mike Sherov <mike.sherov@gmail.com> | 2012-10-16 12:30:28 -0400 |
| commit | 861476eb3fb5e378fdbb4e86e4737daf6de27f13 (patch) | |
| tree | 591ced37acc430b1abac8fadf6e9ee00c5803317 | |
| parent | 69ce829dfe6805d3ad7b0c6937dba390a0840e0e (diff) | |
| download | jquery-861476eb3fb5e378fdbb4e86e4737daf6de27f13.tar.gz jquery-861476eb3fb5e378fdbb4e86e4737daf6de27f13.zip | |
Fixes #11635, Explicit overflow:auto is overridden by inline overflow:hidden during animation, closes gh-981
| m--------- | src/sizzle | 0 | ||||
| -rw-r--r-- | src/support.js | 2 | ||||
| -rw-r--r-- | test/data/support/shrinkWrapBlocks.html | 23 | ||||
| -rw-r--r-- | test/unit/support.js | 5 |
4 files changed, 29 insertions, 1 deletions
diff --git a/src/sizzle b/src/sizzle -Subproject f690144148d95adc867fa2a7e25be0e05eb2ecc +Subproject 3ed4e970e262230c799eaf24cc6d889828a3d6f 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 @@ +<!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> 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, |