git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
faefbb1
)
Fix a potential error in the previous commit caused by the use of a separate index...
author
Colin Snover
<github.com@zetafleet.com>
Wed, 22 Dec 2010 15:13:28 +0000
(09:13 -0600)
committer
Colin Snover
<github.com@zetafleet.com>
Wed, 22 Dec 2010 15:13:28 +0000
(09:13 -0600)
src/manipulation.js
patch
|
blob
|
history
diff --git
a/src/manipulation.js
b/src/manipulation.js
index
c23f62e
..
203d2ef
100644
(file)
--- a/
src/manipulation.js
+++ b/
src/manipulation.js
@@
-370,14
+370,18
@@
function root( elem, cur ) {
}
function cloneCopyEvent(orig, ret) {
}
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;
}
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;
curData = jQuery.data( this, jQuery.extend(true, {}, oldData) ),
events = oldData && oldData.events;