library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Landing pull request 490. 1.7 HTML5 Support for innerHTML, clone & style. Fixes #6485.

Browse Source 
More Details:
 - https://github.com/jquery/jquery/pull/490
 - http://bugs.jquery.com/ticket/6485
This commit is contained in:
Rick Waldron 2011-09-19 16:42:36 -04:00 committed by timmywil
parent bba3d610c7
commit 9ecdb2472b
4 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/manipulation.js
View File

@ -20,7 +20,23 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ], col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
area: [ 1, "<map>", "</map>" ], area: [ 1, "<map>", "</map>" ],
_default: [ 0, "", "" ] _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.optgroup = wrapMap.option;
wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
@ -625,6 +641,9 @@ jQuery.extend({
depth = wrap[0], depth = wrap[0],
div = context.createElement("div"); 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 // Go to html and back, then peel off extra wrappers
div.innerHTML = wrap[1] + elem + wrap[2]; div.innerHTML = wrap[1] + elem + wrap[2];

5
src/support.js
View File

@ -24,7 +24,7 @@ jQuery.support = (function() {
// Preliminary tests // Preliminary tests
div.setAttribute("className", "t"); 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( "*" ); all = div.getElementsByTagName( "*" );
@ -69,6 +69,9 @@ jQuery.support = (function() {
// (IE uses styleFloat instead of cssFloat) // (IE uses styleFloat instead of cssFloat)
cssFloat: !!a.style.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 // Make sure that if no value is specified for a checkbox
// that it defaults to "on". // that it defaults to "on".
// (WebKit defaults to "" instead) // (WebKit defaults to "" instead)

9
test/index.html
View File

@ -51,6 +51,15 @@
<script src="unit/effects.js"></script> <script src="unit/effects.js"></script>
<script src="unit/offset.js"></script> <script src="unit/offset.js"></script>
<script src="unit/dimensions.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> </head>
<body id="body"> <body id="body">

32
test/unit/manipulation.js
View File

@ -465,6 +465,38 @@ test("append the same fragment with events (Bug #6997, 5566)", function () {
jQuery("#listWithTabIndex li.test6997").eq(1).click(); 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() { test("append(xml)", function() {
expect( 1 ); expect( 1 );