X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=442a14d2990dc978c8374232050988cb6dc2a4db;hb=8d8db3f2b3f8c3d41854726c8a0227f6deecc602;hp=af71ff62cce50fd9a6471ed3a16d06913b1d64be;hpb=49cd9c66bf6097ced133971a82fa9bd7b2f73e1a;p=jquery.git diff --git a/src/manipulation.js b/src/manipulation.js index af71ff6..442a14d 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 ); }); }, @@ -308,12 +311,19 @@ jQuery.fn.extend({ if ( first ) { table = table && jQuery.nodeName( first, "tr" ); - for ( var i = 0, l = this.length; i < l; i++ ) { + for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) { callback.call( table ? root(this[i], first) : this[i], - i > 0 || results.cacheable || (this.length > 1 && i > 0) ? + // Make sure that we do not leak memory by inadvertently discarding + // the original fragment (which might have attached data) instead of + // using it; in addition, use the original fragment object for the last + // item instead of first because it can end up being emptied incorrectly + // in certain situations (Bug #8070). + // Fragments from the fragment cache must always be cloned and never used + // in place. + results.cacheable || (l > 1 && i < lastIndex) ? jQuery.clone( fragment, true, true ) : fragment ); @@ -480,13 +490,13 @@ jQuery.each({ }); jQuery.extend({ - clone: function( elem, dataAndEvents, deepCloneDataAndEvents ) { - - var clone = elem.cloneNode(true), - srcElements, - destElements; + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var clone = elem.cloneNode(true), + srcElements, + 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 +511,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 +519,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] ); } }