Skip to content
Permalink
Browse files

Cleaned up; fixes per review

  • Loading branch information
rwaldron committed Jan 20, 2011
1 parent 49cd9c6 commit 6458885881e7badb99c70c24843c31d13064a167
Showing with 12 additions and 10 deletions.
  1. +1 −1 src/core.js
  2. +11 −9 src/manipulation.js
@@ -130,7 +130,7 @@ jQuery.fn = jQuery.prototype = {

} else {
ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
selector = (ret.cacheable ? jQuery(ret.fragment).clone()[0] : ret.fragment).childNodes;
selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
}

return jQuery.merge( this, selector );
@@ -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,12 @@ jQuery.each({
});

jQuery.extend({
clone: function( elem, dataAndEvents, deepCloneDataAndEvents ) {

clone: function( elem, dataAndEvents, deepDataAndEvents ) {
var clone = elem.cloneNode(true),
srcElements,
destElements;

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
@@ -509,17 +511,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 ( var i = 0; srcElements[i]; ++i ) {
cloneCopyEvent( srcElements[i], destElements[i] );
}
}

0 comments on commit 6458885

Please sign in to comment.
You can’t perform that action at this time.