X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=5f4b15dd946168211586820da2a1c00debf999bb;hb=82ac384b494258e17e2856ee2259475ecb0174ca;hp=c23f62ed19c732a3d7e411ff18822e70dadb7510;hpb=faefbb1ad0b81e8001b582d06d5bd9c9236e62ce;p=jquery.git diff --git a/src/manipulation.js b/src/manipulation.js index c23f62e..5f4b15d 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -370,15 +370,19 @@ 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) || !jQuery.hasData(orig[i]) ) { + ret.each(function (nodeIndex) { + if ( this.nodeType !== 1 || !jQuery.hasData(orig[nodeIndex]) ) { return; } - var oldData = jQuery.data( orig[i++] ), - curData = jQuery.data( this, jQuery.extend(true, {}, oldData) ), + // 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; if ( 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 ); } } }