From 5607bd8d53c5086bedb702f71dee02543cc7056a Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Wed, 22 Dec 2010 09:13:28 -0600 Subject: [PATCH] Fix a potential error in the previous commit caused by the use of a separate index variable. Thanks to dmethvin for the review. --- src/manipulation.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/manipulation.js b/src/manipulation.js index c23f62e..203d2ef 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) || !jQuery.hasData(orig[i]) ) { + 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, jQuery.extend(true, {}, oldData) ), events = oldData && oldData.events; -- 1.7.10.4