diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2011-11-08 09:42:43 -0500 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2011-11-08 09:42:43 -0500 |
| commit | 95cd2009f69b666efbf42f99ee0e586503575739 (patch) | |
| tree | 3906695ca8e53e748bf4e732af90c556a39ff1d0 /src | |
| parent | 586fb059190ecacd89e3cd211c78e776792d2f2b (diff) | |
| parent | 0ce2d5e1cb4c2484154a916f3d1876759a59c032 (diff) | |
| download | jquery-95cd2009f69b666efbf42f99ee0e586503575739.tar.gz jquery-95cd2009f69b666efbf42f99ee0e586503575739.zip | |
Merge branch 'master' of github.com:jquery/jquery
Diffstat (limited to 'src')
| -rw-r--r-- | src/manipulation.js | 2 | ||||
| m--------- | src/sizzle | 0 | ||||
| -rw-r--r-- | src/support.js | 9 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/manipulation.js b/src/manipulation.js index 70487c139..00f417226 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -483,7 +483,7 @@ jQuery.buildFragment = function( args, nodes, scripts ) { if ( args.length === 1 && typeof first === "string" && first.length < 512 && doc === document && first.charAt(0) === "<" && !rnocache.test( first ) && (jQuery.support.checkClone || !rchecked.test( first )) && - (!jQuery.support.unknownElems && rnoshimcache.test( first )) ) { + (jQuery.support.html5Clone || !rnoshimcache.test( first )) ) { cacheable = true; diff --git a/src/sizzle b/src/sizzle -Subproject 5d3cc64e732631cde3924a3deaaf4a282feef1c +Subproject d4e5c22e7ee8aa5751fc8d4d4f21d7ed5ff04a4 diff --git a/src/support.js b/src/support.js index 7f49516f8..df8e41f91 100644 --- a/src/support.js +++ b/src/support.js @@ -24,7 +24,7 @@ jQuery.support = (function() { // Preliminary tests div.setAttribute("className", "t"); - div.innerHTML = " <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/><nav></nav>"; + div.innerHTML = " <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>"; all = div.getElementsByTagName( "*" ); @@ -69,9 +69,6 @@ jQuery.support = (function() { // (IE uses styleFloat instead of cssFloat) cssFloat: !!a.style.cssFloat, - // Make sure unknown elements (like HTML5 elems) are handled appropriately - unknownElems: !!div.getElementsByTagName( "nav" ).length, - // Make sure that if no value is specified for a checkbox // that it defaults to "on". // (WebKit defaults to "" instead) @@ -87,6 +84,10 @@ jQuery.support = (function() { // Tests for enctype support on a form(#6743) enctype: !!document.createElement("form").enctype, + // Makes sure cloning an html5 element does not cause problems + // Where outerHTML is undefined, this still works + html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>", + // Will be defined later submitBubbles: true, changeBubbles: true, |