Renamed src/transports to src/ajax (in case we need prefilters in the future and...

[jquery.git] / src / manipulation.js

diff --git a/src/manipulation.js b/src/manipulation.js
index 24409d2..96caa02 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;
 
@@ -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 );
                                }
                        }
                }
@@ -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;
        }
 
@@ -438,12 +440,12 @@ jQuery.buildFragment = function( args, nodes, scripts ) {
        var fragment, cacheable, cacheresults,
                doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
 
-       // Only cache "small" (1/2 KB) strings that are associated with the main document
+       // Only cache "small" (1/2 KB) HTML strings that are associated with the main document
        // Cloning options loses the selected state, so don't cache them
        // IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
        // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
        if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-               !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+               args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
 
                cacheable = true;
                cacheresults = jQuery.fragments[ args[0] ];