X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Fmanipulation.js;h=b7f2d3e43796a0760f8799cf129947d7197e0fc3;hp=af71ff62cce50fd9a6471ed3a16d06913b1d64be;hb=9d306bd73bb47562cd52f0fc4cc158c534cfdfdf;hpb=49cd9c66bf6097ced133971a82fa9bd7b2f73e1a

diff --git a/src/manipulation.js b/src/manipulation.js
index af71ff6..b7f2d3e 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -183,9 +183,12 @@ jQuery.fn.extend({
 		return this;
 	},
 
-	clone: function( events, deepData ) {
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? true : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+		
 		return this.map( function () {
-			return jQuery.clone( this, events == null ? true : events, deepData == null ? true : deepData );
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
 		});
 	},
 
@@ -480,13 +483,13 @@ jQuery.each({
 });
 
 jQuery.extend({
-	clone: function( elem, dataAndEvents, deepCloneDataAndEvents ) {
-
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
 		var clone = elem.cloneNode(true), 
 				srcElements, 
-				destElements;
+				destElements, 
+				i;
 
-		if ( !jQuery.support.noCloneEvent && ( elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+		if ( !jQuery.support.noCloneEvent && (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
 			// 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
@@ -501,7 +504,7 @@ jQuery.extend({
 			// Weird iteration because IE will replace the length property
 			// with an element if you are cloning the body and one of the
 			// elements on the page has a name or id of "length"
-			for ( var i = 0; srcElements[i]; ++i ) {
+			for ( i = 0; srcElements[i]; ++i ) {
 				cloneFixAttributes( srcElements[i], destElements[i] );
 			}
 
@@ -509,17 +512,17 @@ jQuery.extend({
 		}
 
 		// Copy the events from the original to the clone
-		if ( dataAndEvents === true ) {
+		if ( dataAndEvents ) {
 
-			cloneCopyEvent( elem , clone );
+			cloneCopyEvent( elem, clone );
 
-			if ( deepCloneDataAndEvents === true && "getElementsByTagName" in elem ) {
+			if ( deepDataAndEvents && "getElementsByTagName" in elem ) {
 
 				srcElements = elem.getElementsByTagName("*");
 				destElements = clone.getElementsByTagName("*");
 
 				if ( srcElements.length ) {
-					for ( var i = 0; i < srcElements.length; ++i ) {
+					for ( i = 0; srcElements[i]; ++i ) {
 						cloneCopyEvent( srcElements[i], destElements[i] );
 					}
 				}