diff options
| author | Rick Waldron <waldron.rick@gmail.com> | 2011-09-19 16:42:36 -0400 |
|---|---|---|
| committer | timmywil <timmywillisn@gmail.com> | 2011-09-19 16:42:36 -0400 |
| commit | 9ecdb2472be7661477564e46bce51432d4a5a84e (patch) | |
| tree | 5059797d940cc0b009b30141b023caa2afcb5523 | |
| parent | bba3d610c7e3b611fe1eb89178c91106a156a5dc (diff) | |
| download | jquery-9ecdb2472be7661477564e46bce51432d4a5a84e.tar.gz jquery-9ecdb2472be7661477564e46bce51432d4a5a84e.zip | |
Landing pull request 490. 1.7 HTML5 Support for innerHTML, clone & style. Fixes #6485.
More Details:
- https://github.com/jquery/jquery/pull/490
- http://bugs.jquery.com/ticket/6485
| -rw-r--r-- | src/manipulation.js | 21 | ||||
| -rw-r--r-- | src/support.js | 5 | ||||
| -rw-r--r-- | test/index.html | 9 | ||||
| -rw-r--r-- | test/unit/manipulation.js | 32 |
4 files changed, 65 insertions, 2 deletions
diff --git a/src/manipulation.js b/src/manipulation.js index 35c9544ff..bc2af18dc 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -20,7 +20,23 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ], area: [ 1, "<map>", "</map>" ], _default: [ 0, "", "" ] - }; + }, + safeFragment = (function() { + var nodeNames = ( + "abbr article aside audio canvas datalist details figcaption figure footer " + + "header hgroup mark meter nav output progress section summary time video" + ).split( " " ), + safeFrag = document.createDocumentFragment(); + + if ( safeFrag.createElement ) { + while ( nodeNames.length ) { + safeFrag.createElement( + nodeNames.pop() + ); + } + } + return safeFrag; + })(); wrapMap.optgroup = wrapMap.option; wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; @@ -625,6 +641,9 @@ jQuery.extend({ depth = wrap[0], div = context.createElement("div"); + // Append wrapper element to unknown element safe doc fragment + safeFragment.appendChild( div ); + // Go to html and back, then peel off extra wrappers div.innerHTML = wrap[1] + elem + wrap[2]; diff --git a/src/support.js b/src/support.js index 6608d9125..ad1bd9a57 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'/>"; + div.innerHTML = " <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/><nav></nav>"; all = div.getElementsByTagName( "*" ); @@ -69,6 +69,9 @@ 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) diff --git a/test/index.html b/test/index.html index 17baa4894..294e04316 100644 --- a/test/index.html +++ b/test/index.html @@ -51,6 +51,15 @@ <script src="unit/effects.js"></script> <script src="unit/offset.js"></script> <script src="unit/dimensions.js"></script> + + <script> + // html5shiv, enabling HTML5 elements to be used with jQuery + ( "abbr article aside audio canvas details figcaption figure footer header hgroup " + + "mark meter nav output progress section subline summary time video" + ).replace(/\w+/g, function(n) { + document.createElement(n); + }); + </script> </head> <body id="body"> diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index 4017cf196..3de3fa0b9 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -465,6 +465,38 @@ test("append the same fragment with events (Bug #6997, 5566)", function () { jQuery("#listWithTabIndex li.test6997").eq(1).click(); }); +test("append HTML5 sectioning elements (Bug #6485)", function () { + expect(2); + + jQuery("#qunit-fixture").append("<article style='font-size:10px'><section><aside>HTML5 elements</aside></section></article>"); + + var article = jQuery("article"), + aside = jQuery("aside"); + + equal( article.css("fontSize"), "10px", 'HTML5 elements are styleable'); + equal( aside.length, 1, 'HTML5 elements do not collapse their children') +}); + +test("clone() (#6485)", function () { + expect(1); + + jQuery("<article><section><aside>HTML5 elements</aside></section></article>").appendTo("#qunit-fixture"); + + var clone = jQuery("article").clone(); + + jQuery("#qunit-fixture").append( clone ); + + equal( jQuery("aside").length, 2, "clone()ing HTML5 elems does not collapse them" ); +}); + +test("html(String) with HTML5 (Bug #6485)", function() { + expect(2); + + jQuery("#qunit-fixture").html("<article><section><aside>HTML5 elements</aside></section></article>"); + equal( jQuery("#qunit-fixture").children().children().length, 1, "Make sure HTML5 article elements can hold children. innerHTML shortcut path" ); + equal( jQuery("#qunit-fixture").children().children().children().length, 1, "Make sure nested HTML5 elements can hold children." ); +}); + test("append(xml)", function() { expect( 1 ); |