Remove code for ticket #7717 which has been marked WONTFIX to match existing $.data...

[jquery.git] / src / manipulation.js

diff --git a/src/manipulation.js b/src/manipulation.js
index 24409d2..3b9aa14 100644 (file)
--- 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) ) {
+       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, oldData ),
                        events = oldData && oldData.events;
 
@@ -415,17 +419,15 @@ function cloneFixAttributes(src, dest) {
        // attribute) to identify the type of content to display
        if ( nodeName === "object" ) {
                dest.outerHTML = src.outerHTML;
-       }
 
-       // IE6-? fails to persist the checked state of a cloned checkbox
+       // IE6-8 fails to persist the checked state of a cloned checkbox
        // or radio button
-       else if ( nodeName === "input" && src.checked ) {
+       } else if ( nodeName === "input" && src.checked ) {
                dest.defaultChecked = dest.checked = src.checked;
-       }
 
-       // IE6-? fails to return the selected option to the default selected
+       // IE6-8 fails to return the selected option to the default selected
        // state when cloning options
-       else if ( nodeName === "option" ) {
+       } else if ( nodeName === "option" ) {
                dest.selected = src.defaultSelected;
        }