Merge branch 'bug5566' of https://github.com/csnover/jquery into csnover-bug5566

[jquery.git] / src / manipulation.js

diff --git a/src/manipulation.js b/src/manipulation.js
index 5b53da8..8d951b6 100644 (file)
--- 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, "")
@@ -349,7 +352,7 @@ jQuery.fn.extend({
                                                        root(this[i], first) :
                                                        this[i],
                                                i > 0 || results.cacheable || this.length > 1  ?
-                                                       fragment.cloneNode(true) :
+                                                       jQuery(fragment).clone(true)[0] :
                                                        fragment
                                        );
                                }