X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=3895a7a0156d585d0d9cb59f7dbea4b617cc0058;hb=4fae75d575b20d887e4a273c7991c55f8821a62c;hp=8d951b648547eb476fa395045b379909fcf08e75;hpb=cec68e2b00d86357c18b576cbaed52cc1ea42a74;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 8d951b6..3895a7a 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -9,9 +9,6 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rnocache = /<(?:script|object|embed|option|style)/i,
 	// 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>" ],
@@ -189,32 +186,38 @@ jQuery.fn.extend({
 	clone: function( events ) {
 		// Do the clone
 		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// 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>" );
-				}
+			var clone = this.cloneNode(true);
+			if ( !jQuery.support.noCloneEvent && (this.nodeType === 1 || this.nodeType === 11) && !jQuery.isXMLDoc(this) ) {
+				// IE copies events bound via attachEvent when using cloneNode.
+				// Calling detachEvent on the clone will also remove the events
+				// from the original. In order to get around this, we use some
+				// proprietary methods to clear the events. Thanks to MooTools
+				// guys for this hotness.
+				var srcElements = jQuery(this).find('*').andSelf();
+				jQuery(clone).find('*').andSelf().each(function (i, clone) {
+					// We do not need to do anything for non-Elements
+					if (this.nodeType !== 1) {
+						return;
+					}
 
-				return jQuery.clean([html.replace(rinlinejQuery, "")
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
-					.replace(raction, '="$1">')
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
-			} else {
-				return this.cloneNode(true);
+					// clearAttributes removes the attributes, but also
+					// removes the attachEvent events
+					clone.clearAttributes();
+
+					// mergeAttributes only merges back on the original attributes,
+					// not the events
+					clone.mergeAttributes(srcElements[i]);
+
+					// IE6-8 fail to clone children inside object elements that use
+					// the proprietary classid attribute value (rather than the type
+					// attribute) to identify the type of content to display
+					if (clone.nodeName.toLowerCase() === 'object') {
+						clone.outerHTML = srcElements[i].outerHTML;
+					}
+				});
 			}
+
+			return clone;
 		});
 
 		// Copy the events from the original to the clone
@@ -352,7 +355,7 @@ jQuery.fn.extend({
 							root(this[i], first) :
 							this[i],
 						i > 0 || results.cacheable || this.length > 1  ?
-							jQuery(fragment).clone(true)[0] :
+							fragment.cloneNode(true) :
 							fragment
 					);
 				}
@@ -378,7 +381,7 @@ function cloneCopyEvent(orig, ret) {
 	var i = 0;
 
 	ret.each(function() {
-		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+		if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) ) {
 			return;
 		}