Merge branch 't4386' of https://github.com/jitter/jquery into jitter-…

…t4386
jquery · Dec 6, 2010 · 0276b9d · 0276b9d
2 parents 54a68fa + ab2a70e
commit 0276b9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/manipulation.js b/src/manipulation.js
@@ -10,6 +10,8 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	// checked="checked" or checked (html5)
 	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
 	raction = /\=([^="'>\s]+\/)>/g,
+	rbodystart = /^\s*<body/i,
+	rbodyend = /<\/body>\s*$/i,
 	wrapMap = {
 		option: [ 1, "<select multiple='multiple'>", "</select>" ],
 		legend: [ 1, "<fieldset>", "</fieldset>" ],
@@ -198,11 +200,12 @@ jQuery.fn.extend({
 				// the name attribute on an input).
 				var html = this.outerHTML,
 					ownerDocument = this.ownerDocument;
-
 				if ( !html ) {
 					var div = ownerDocument.createElement("div");
 					div.appendChild( this.cloneNode(true) );
 					html = div.innerHTML;
+				} else if ( rbodystart.test(html) && rbodyend.test(html) ) {
+					html = html.replace( rbodystart, "<div>" ).replace( rbodyend, "</div>" );
 				}
 
 				return jQuery.clean([html.replace(rinlinejQuery, "")

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
@@ -814,7 +814,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("clone()", function() {
-	expect(31);
+	expect(32);
 	equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' );
 	var clone = jQuery('#yahoo').clone();
 	equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );
@@ -872,6 +872,8 @@ test("clone()", function() {
 	form.appendChild( div );
 
 	equals( jQuery(form).clone().children().length, 1, "Make sure we just get the form back." );
+
+	equal( jQuery("body").clone().children()[0].id, "qunit-header", "Make sure cloning body works" );
 });
 
 if (!isLocal) {