Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997.

Conflicts:
	src/manipulation.js
	test/unit/manipulation.js

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,33 +186,39 @@ jQuery.fn.extend({
 	clone: function( events ) {
 		// Do the clone
 		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+			var clone = this.cloneNode(true);
-				// IE copies events bound via attachEvent when
+			if ( !jQuery.support.noCloneEvent && (this.nodeType === 1 || this.nodeType === 11) && !jQuery.isXMLDoc(this) ) {
-				// using cloneNode. Calling detachEvent on the
+				// IE copies events bound via attachEvent when using cloneNode.
-				// clone will also remove the events from the orignal
+				// Calling detachEvent on the clone will also remove the events
-				// In order to get around this, we use innerHTML.
+				// from the original. In order to get around this, we use some
-				// Unfortunately, this means some modifications to
+				// proprietary methods to clear the events. Thanks to MooTools
-				// attributes in IE that are actually only stored
+				// guys for this hotness.
-				// as properties will not be copied (such as the
+				var srcElements = jQuery(this).find('*').andSelf();
-				// the name attribute on an input).
+				jQuery(clone).find('*').andSelf().each(function (i, clone) {
-				var html = this.outerHTML,
+					// We do not need to do anything for non-Elements
-					ownerDocument = this.ownerDocument;
+					if (this.nodeType !== 1) {
-				if ( !html ) {
+						return;
-					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, "")
+					// clearAttributes removes the attributes, but also
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
+					// removes the attachEvent events
-					.replace(raction, '="$1">')
+					clone.clearAttributes();
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
+
-			} else {
+					// mergeAttributes only merges back on the original attributes,
-				return this.cloneNode(true);
+					// 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
 		if ( events === true ) {
@@ -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;
 		}
 

test/unit/manipulation.js

@@ -381,6 +381,40 @@ test("append(Function) with incoming value", function() {
 	QUnit.reset();
 });
 
+test("append the same fragment with events (Bug #6997, 5566)", function () {
+	expect(2 + (document.fireEvent ? 1 : 0));
+	stop(1000);
+
+	var element;
+
+	// This patch modified the way that cloning occurs in IE; we need to make sure that
+	// native event handlers on the original object don’t get disturbed when they are
+	// modified on the clone
+	if (!jQuery.support.noCloneEvent && document.fireEvent) {
+		element = jQuery("div:first").click(function () {
+			ok(true, "Event exists on original after being unbound on clone");
+			jQuery(this).unbind('click');
+		});
+		element.clone(true).unbind('click')[0].fireEvent('onclick');
+		element[0].fireEvent('onclick');
+	}
+
+	element = jQuery("<a class='test6997'></a>").click(function () {
+		ok(true, "Append second element events work");
+	});
+
+	jQuery("#listWithTabIndex li").append(element)
+		.find('a.test6997').eq(1).click();
+
+	element = jQuery("<li class='test6997'></li>").click(function () {
+		ok(true, "Before second element events work");
+		start();
+	});
+
+	jQuery("#listWithTabIndex li").before(element);
+	jQuery("#listWithTabIndex li.test6997").eq(1).click();
+});
+
 test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	expect(16);
 
@@ -814,7 +848,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("clone()", function() {
-	expect(32);
+	expect(36);
 	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' );
@@ -828,7 +862,7 @@ test("clone()", function() {
 	];
 	for (var i = 0; i < cloneTags.length; i++) {
 		var j = jQuery(cloneTags[i]);
-		equals( j[0].tagName, j.clone()[0].tagName, 'Clone a &lt;' + cloneTags[i].substring(1));
+		equals( j[0].tagName, j.clone()[0].tagName, 'Clone a ' + cloneTags[i]);
 	}
 
 	// using contents will get comments regular, text, and comment nodes
@@ -854,11 +888,23 @@ test("clone()", function() {
 	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
 	div.find("table:last").trigger("click");
 
-	div = jQuery("<div/>").html('<object height="355" width="425">  <param name="movie" value="http://www.youtube.com/v/JikaHBDoV3k&amp;hl=en">  <param name="wmode" value="transparent"> </object>');
+	// this is technically an invalid object, but because of the special
+	// classid instantiation it is the only kind that IE has trouble with,
+	// so let’s test with it too.
+	div = jQuery("<div/>").html('<object height="355" width="425" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">  <param name="movie" value="http://www.youtube.com/v/3KANI2dpXLw&amp;hl=en">  <param name="wmode" value="transparent"> </object>');
 
-	div = div.clone(true);
+	clone = div.clone(true);
-	equals( div.length, 1, "One element cloned" );
+	equals( clone.length, 1, "One element cloned" );
-	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+	equals( clone.html(), div.html(), "Element contents cloned" );
+	equals( clone[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+
+	// and here's a valid one.
+	div = jQuery("<div/>").html('<object height="355" width="425" type="application/x-shockwave-flash" data="http://www.youtube.com/v/3KANI2dpXLw&amp;hl=en">  <param name="movie" value="http://www.youtube.com/v/3KANI2dpXLw&amp;hl=en">  <param name="wmode" value="transparent"> </object>');
+
+	clone = div.clone(true);
+	equals( clone.length, 1, "One element cloned" );
+	equals( clone.html(), div.html(), "Element contents cloned" );
+	equals( clone[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
 
 	div = jQuery("<div/>").data({ a: true, b: true });
 	div = div.clone(true);