X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=5f4b15dd946168211586820da2a1c00debf999bb;hb=82ac384b494258e17e2856ee2259475ecb0174ca;hp=63203ef3b3d1c0b71f518fee1e8f3448586a74f4;hpb=c9c9057c4d4097767ca181bdb4bb27d6fd2d8fbd;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 63203ef..5f4b15d 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -370,14 +370,18 @@ function root( elem, cur ) {
 }
 
 function cloneCopyEvent(orig, ret) {
-	var i = 0;
-
-	ret.each(function() {
-		if ( this.nodeType !== 1 || this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+	ret.each(function (nodeIndex) {
+		if ( this.nodeType !== 1 || !jQuery.hasData(orig[nodeIndex]) ) {
 			return;
 		}
 
-		var oldData = jQuery.data( orig[i++] ),
+		// XXX remove for 1.5 RC or merge back in if there is actually a reason for this check that has been
+		// unexposed by unit tests
+		if ( this.nodeName !== (orig[nodeIndex] && orig[nodeIndex].nodeName) ) {
+			throw "Cloned data mismatch";
+		}
+
+		var oldData = jQuery.data( orig[nodeIndex] ),
 			curData = jQuery.data( this, oldData ),
 			events = oldData && oldData.events;
 
@@ -386,8 +390,8 @@ function cloneCopyEvent(orig, ret) {
 			curData.events = {};
 
 			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( this, type, events[ type ][ i ], events[ type ][ i ].data );
 				}
 			}
 		}
@@ -415,17 +419,15 @@ function cloneFixAttributes(src, dest) {
 	// attribute) to identify the type of content to display
 	if ( nodeName === "object" ) {
 		dest.outerHTML = src.outerHTML;
-	}
 
 	// IE6-8 fails to persist the checked state of a cloned checkbox
 	// or radio button
-	else if ( nodeName === "input" && src.checked ) {
+	} else if ( nodeName === "input" && src.checked ) {
 		dest.defaultChecked = dest.checked = src.checked;
-	}
 
 	// IE6-8 fails to return the selected option to the default selected
 	// state when cloning options
-	else if ( nodeName === "option" ) {
+	} else if ( nodeName === "option" ) {
 		dest.selected = src.defaultSelected;
 	}