From: Colin Snover <github.com@zetafleet.com>
Date: Sun, 12 Dec 2010 08:39:06 +0000 (-0600)
Subject: Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997.
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=4fae75d575b20d887e4a273c7991c55f8821a62c;hp=974637d639a06a050e11d87677d1c1c80bed709d

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

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

diff --git a/src/manipulation.js b/src/manipulation.js
index e09dd7e..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>" ],
@@ -151,7 +148,7 @@ jQuery.fn.extend({
 			return set;
 		}
 	},
-	
+
 	// keepData is for internal use only--do not document
 	remove: function( selector, keepData ) {
 		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
@@ -166,7 +163,7 @@ jQuery.fn.extend({
 				}
 			}
 		}
-		
+
 		return this;
 	},
 
@@ -182,39 +179,45 @@ jQuery.fn.extend({
 				elem.removeChild( elem.firstChild );
 			}
 		}
-		
+
 		return this;
 	},
 
 	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
@@ -334,9 +337,9 @@ jQuery.fn.extend({
 			} else {
 				results = jQuery.buildFragment( args, this, scripts );
 			}
-			
+
 			fragment = results.fragment;
-			
+
 			if ( fragment.childNodes.length === 1 ) {
 				first = fragment = fragment.firstChild;
 			} else {
@@ -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;
 		}
 
@@ -444,18 +447,18 @@ jQuery.each({
 		var ret = [],
 			insert = jQuery( selector ),
 			parent = this.length === 1 && this[0].parentNode;
-		
+
 		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
 			insert[ original ]( this[0] );
 			return this;
-			
+
 		} else {
 			for ( var i = 0, l = insert.length; i < l; i++ ) {
 				var elems = (i > 0 ? this.clone(true) : this).get();
 				jQuery( insert[i] )[ original ]( elems );
 				ret = ret.concat( elems );
 			}
-		
+
 			return this.pushStack( ret, name, insert.selector );
 		}
 	};
@@ -543,7 +546,7 @@ jQuery.extend({
 			for ( i = 0; ret[i]; i++ ) {
 				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
 					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-				
+
 				} else {
 					if ( ret[i].nodeType === 1 ) {
 						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
@@ -555,22 +558,22 @@ jQuery.extend({
 
 		return ret;
 	},
-	
+
 	cleanData: function( elems ) {
 		var data, id, cache = jQuery.cache,
 			special = jQuery.event.special,
 			deleteExpando = jQuery.support.deleteExpando;
-		
+
 		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
 			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
 				continue;
 			}
 
 			id = elem[ jQuery.expando ];
-			
+
 			if ( id ) {
 				data = cache[ id ];
-				
+
 				if ( data && data.events ) {
 					for ( var type in data.events ) {
 						if ( special[ type ] ) {
@@ -581,14 +584,14 @@ jQuery.extend({
 						}
 					}
 				}
-				
+
 				if ( deleteExpando ) {
 					delete elem[ jQuery.expando ];
 
 				} else if ( elem.removeAttribute ) {
 					elem.removeAttribute( jQuery.expando );
 				}
-				
+
 				delete cache[ id ];
 			}
 		}
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 4805016..29c79a2 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -37,16 +37,16 @@ test("text(Function)", function() {
 
 test("text(Function) with incoming value", function() {
 	expect(2);
-	
+
 	var old = "This link has class=\"blog\": Simon Willison's Weblog";
-	
+
 	jQuery('#sap').text(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return "foobar";
 	});
-	
+
 	equals( jQuery("#sap").text(), "foobar", 'Check for merged text of more then one element.' );
-	
+
 	QUnit.reset();
 });
 
@@ -240,7 +240,7 @@ var testAppend = function(valueObj) {
 	ok( jQuery("#sap").append(valueObj( [] )), "Check for appending an empty array." );
 	ok( jQuery("#sap").append(valueObj( "" )), "Check for appending an empty string." );
 	ok( jQuery("#sap").append(valueObj( document.getElementsByTagName("foo") )), "Check for appending an empty nodelist." );
-	
+
 	QUnit.reset();
 	jQuery("form").append(valueObj('<input name="radiotest" type="radio" checked="checked" />'));
 	jQuery("form input[name=radiotest]").each(function(){
@@ -322,18 +322,18 @@ test("append(Function)", function() {
 
 test("append(Function) with incoming value", function() {
 	expect(12);
-	
+
 	var defaultText = 'Try them out:', old = jQuery("#first").html();
-	
+
 	var result = jQuery('#first').append(function(i, val){
 		equals( val, old, "Make sure the incoming value is correct." );
 		return '<b>buga</b>';
 	});
 	equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
-	
+
 	var select = jQuery('#select3');
 	old = select.html();
-	
+
 	equals( select.append(function(i, val){
 		equals( val, old, "Make sure the incoming value is correct." );
 		return '<option value="appendTest">Append Test</option>';
@@ -342,7 +342,7 @@ test("append(Function) with incoming value", function() {
 	QUnit.reset();
 	var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
 	old = jQuery("#sap").html();
-	
+
 	jQuery('#sap').append(function(i, val){
 		equals( val, old, "Make sure the incoming value is correct." );
 		return document.getElementById('first');
@@ -352,7 +352,7 @@ test("append(Function) with incoming value", function() {
 	QUnit.reset();
 	expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
 	old = jQuery("#sap").html();
-	
+
 	jQuery('#sap').append(function(i, val){
 		equals( val, old, "Make sure the incoming value is correct." );
 		return [document.getElementById('first'), document.getElementById('yahoo')];
@@ -362,7 +362,7 @@ test("append(Function) with incoming value", function() {
 	QUnit.reset();
 	expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:";
 	old = jQuery("#sap").html();
-	
+
 	jQuery('#sap').append(function(i, val){
 		equals( val, old, "Make sure the incoming value is correct." );
 		return jQuery("#yahoo, #first");
@@ -371,16 +371,50 @@ test("append(Function) with incoming value", function() {
 
 	QUnit.reset();
 	old = jQuery("#sap").html();
-	
+
 	jQuery("#sap").append(function(i, val){
 		equals( val, old, "Make sure the incoming value is correct." );
 		return 5;
 	});
-	ok( jQuery("#sap")[0].innerHTML.match( /5$/ ), "Check for appending a number" );	
-	
+	ok( jQuery("#sap")[0].innerHTML.match( /5$/ ), "Check for appending a number" );
+
 	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);
 
@@ -489,16 +523,16 @@ test("prepend(Function)", function() {
 
 test("prepend(Function) with incoming value", function() {
 	expect(10);
-	
+
 	var defaultText = 'Try them out:', old = jQuery('#first').html();
 	var result = jQuery('#first').prepend(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return '<b>buga</b>';
 	});
 	equals( result.text(), 'buga' + defaultText, 'Check if text prepending works' );
-	
+
 	old = jQuery("#select3").html();
-	
+
 	equals( jQuery('#select3').prepend(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return '<option value="prependTest">Prepend Test</option>';
@@ -507,35 +541,35 @@ test("prepend(Function) with incoming value", function() {
 	QUnit.reset();
 	var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
 	old = jQuery('#sap').html();
-	
+
 	jQuery('#sap').prepend(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return document.getElementById('first');
 	});
-	
+
 	equals( jQuery('#sap').text(), expected, "Check for prepending of element" );
 
 	QUnit.reset();
 	expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
 	old = jQuery('#sap').html();
-	
+
 	jQuery('#sap').prepend(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return [document.getElementById('first'), document.getElementById('yahoo')];
 	});
-	
+
 	equals( jQuery('#sap').text(), expected, "Check for prepending of array of elements" );
 
 	QUnit.reset();
 	expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
 	old = jQuery('#sap').html();
-	
+
 	jQuery('#sap').prepend(function(i, val) {
 		equals( val, old, "Make sure the incoming value is correct." );
 		return jQuery("#yahoo, #first");
 	});
-	
-	equals( jQuery('#sap').text(), expected, "Check for prepending of jQuery object" );	
+
+	equals( jQuery('#sap').text(), expected, "Check for prepending of jQuery object" );
 });
 
 test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -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);
-	equals( div.length, 1, "One element cloned" );
-	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+	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" );
+
+	// 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);
@@ -983,14 +1029,14 @@ test("html(Function)", function() {
 
 test("html(Function) with incoming value", function() {
 	expect(20);
-	
+
 	var div = jQuery("#main > div"), old = div.map(function(){ return jQuery(this).html() });
-	
+
 	div.html(function(i, val) {
 		equals( val, old[i], "Make sure the incoming value is correct." );
 		return "<b>test</b>";
 	});
-	
+
 	var pass = true;
 	div.each(function(){
 		if ( this.childNodes.length !== 1 ) {
@@ -1003,7 +1049,7 @@ test("html(Function) with incoming value", function() {
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
 	old = j.map(function(){ return jQuery(this).html(); });
-	
+
 	j.html(function(i, val) {
 		equals( val, old[i], "Make sure the incoming value is correct." );
 		return "<b>bold</b>";
@@ -1013,17 +1059,17 @@ test("html(Function) with incoming value", function() {
 	if ( j.length === 2 ) {
 		equals( null, null, "Make sure the incoming value is correct." );
 	}
-	
+
 	j.find('b').removeData();
 	equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
-	
+
 	var $div = jQuery('<div />');
-	
+
 	equals( $div.html(function(i, val) {
 		equals( val, "", "Make sure the incoming value is correct." );
 		return 5;
 	}).html(), '5', 'Setting a number as html' );
-	
+
 	equals( $div.html(function(i, val) {
 		equals( val, "5", "Make sure the incoming value is correct." );
 		return 0;
@@ -1034,16 +1080,16 @@ test("html(Function) with incoming value", function() {
 		equals( val, "", "Make sure the incoming value is correct." );
 		return insert;
 	}).html().replace(/>/g, "&gt;"), insert, "Verify escaped insertion." );
-	
+
 	equals( $div2.html(function(i, val) {
 		equals( val.replace(/>/g, "&gt;"), insert, "Make sure the incoming value is correct." );
 		return "x" + insert;
 	}).html().replace(/>/g, "&gt;"), "x" + insert, "Verify escaped insertion." );
-	
+
 	equals( $div2.html(function(i, val) {
 		equals( val.replace(/>/g, "&gt;"), "x" + insert, "Make sure the incoming value is correct." );
 		return " " + insert;
-	}).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );	
+	}).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );
 });
 
 var testRemove = function(method) {
@@ -1077,9 +1123,9 @@ var testRemove = function(method) {
 	var count = 0;
 	var first = jQuery("#ap").children(":first");
 	var cleanUp = first.click(function() { count++ })[method]().appendTo("body").click();
-	
+
 	equals( method == "remove" ? 0 : 1, count );
-	
+
 	cleanUp.detach();
 };
 
@@ -1104,58 +1150,58 @@ test("empty()", function() {
 
 test("jQuery.cleanData", function() {
 	expect(14);
-	
+
 	var type, pos, div, child;
-	
+
 	type = "remove";
-	
+
 	// Should trigger 4 remove event
 	div = getDiv().remove();
-	
+
 	// Should both do nothing
 	pos = "Outer";
 	div.trigger("click");
-	
+
 	pos = "Inner";
 	div.children().trigger("click");
-	
+
 	type = "empty";
 	div = getDiv();
 	child = div.children();
-	
+
 	// Should trigger 2 remove event
 	div.empty();
-	
+
 	// Should trigger 1
 	pos = "Outer";
 	div.trigger("click");
-	
+
 	// Should do nothing
 	pos = "Inner";
 	child.trigger("click");
 
 	// Should trigger 2
 	div.remove();
-	
+
 	type = "html";
-	
+
 	div = getDiv();
 	child = div.children();
-	
+
 	// Should trigger 2 remove event
 	div.html("<div></div>");
-	
+
 	// Should trigger 1
 	pos = "Outer";
 	div.trigger("click");
-	
+
 	// Should do nothing
 	pos = "Inner";
 	child.trigger("click");
 
 	// Should trigger 2
 	div.remove();
-	
+
 	function getDiv() {
 		var div = jQuery("<div class='outer'><div class='inner'></div></div>").click(function(){
 			ok( true, type + " " + pos + " Click event fired." );
@@ -1166,15 +1212,15 @@ test("jQuery.cleanData", function() {
 		}).focus(function(){
 			ok( false, type + " " + pos + " Focus event fired." );
 		}).end().appendTo("body");
-		
+
 		div[0].detachEvent = div[0].removeEventListener = function(t){
 			ok( true, type + " Outer " + t + " event unbound" );
 		};
-		
+
 		div[0].firstChild.detachEvent = div[0].firstChild.removeEventListener = function(t){
 			ok( true, type + " Inner " + t + " event unbound" );
 		};
-		
+
 		return div;
 	}
 });