deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
John Resig 2010-12-06 17:14:20 -05:00
parent 54a68fa973 ab2a70e6cf
commit 0276b9de7e
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/manipulation.js
View file

@ -10,6 +10,8 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
// checked="checked" or checked (html5) // checked="checked" or checked (html5)
rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
raction = /\=([^="'>\s]+\/)>/g, raction = /\=([^="'>\s]+\/)>/g,
rbodystart = /^\s*<body/i,
rbodyend = /<\/body>\s*$/i,
wrapMap = { wrapMap = {
option: [ 1, "<select multiple='multiple'>", "</select>" ], option: [ 1, "<select multiple='multiple'>", "</select>" ],
legend: [ 1, "<fieldset>", "</fieldset>" ], legend: [ 1, "<fieldset>", "</fieldset>" ],
@ -198,11 +200,12 @@ jQuery.fn.extend({
// the name attribute on an input). // the name attribute on an input).
var html = this.outerHTML, var html = this.outerHTML,
ownerDocument = this.ownerDocument; ownerDocument = this.ownerDocument;
if ( !html ) { if ( !html ) {
var div = ownerDocument.createElement("div"); var div = ownerDocument.createElement("div");
div.appendChild( this.cloneNode(true) ); div.appendChild( this.cloneNode(true) );
html = div.innerHTML; 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, "") return jQuery.clean([html.replace(rinlinejQuery, "")

4
test/unit/manipulation.js
View file

@ -814,7 +814,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
}); });
test("clone()", function() { test("clone()", function() {
expect(31); expect(32);
equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' ); equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' );
var clone = jQuery('#yahoo').clone(); var clone = jQuery('#yahoo').clone();
equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' ); equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );
@ -872,6 +872,8 @@ test("clone()", function() {
form.appendChild( div ); form.appendChild( div );
equals( jQuery(form).clone().children().length, 1, "Make sure we just get the form back." ); 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) { if (!isLocal) {