Fix for bug #1600 - multiple selects were being serialized incorrectly.

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index c1e7d9f..eb13540 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -233,17 +233,23 @@ jQuery.fn = jQuery.prototype = {
                var ret = this.map(function(){
                        return this.outerHTML ? jQuery(this.outerHTML)[0] : this.cloneNode(true);
                });
-               
-               if (events === true) {
-                       var clone = ret.find("*").andSelf();
 
+               // Need to set the expando to null on the cloned set if it exists
+               // removeData doesn't work here, IE removes it from the original as well
+               // this is primarily for IE but the data expando shouldn't be copied over in any browser
+               var clone = ret.find("*").andSelf().each(function(){
+                       if ( this[ expando ] != undefined )
+                               this[ expando ] = null;
+               });
+               
+               // Copy the events from the original to the clone
+               if (events === true)
                        this.find("*").andSelf().each(function(i) {
                                var events = jQuery.data(this, "events");
                                for ( var type in events )
                                        for ( var handler in events[type] )
                                                jQuery.event.add(clone[i], type, events[type][handler], events[type][handler].data);
                        });
-               }
 
                // Return the cloned set
                return ret;
@@ -440,7 +446,7 @@ jQuery.extend = jQuery.fn.extend = function() {
        return target;
 };
 
-var expando = "jQuery" + (new Date()).getTime(), uuid = 0;
+var expando = "jQuery" + (new Date()).getTime(), uuid = 0, win = {};
 
 jQuery.extend({
        noConflict: function(deep) {
@@ -485,6 +491,8 @@ jQuery.extend({
        cache: {},
        
        data: function( elem, name, data ) {
+               elem = elem == window ? win : elem;
+
                var id = elem[ expando ];
 
                // Compute a unique ID for the element
@@ -505,6 +513,8 @@ jQuery.extend({
        },
        
        removeData: function( elem, name ) {
+               elem = elem == window ? win : elem;
+
                var id = elem[ expando ];
 
                // If we want to remove a specific section of the element's data
@@ -528,7 +538,8 @@ jQuery.extend({
                        } catch(e){
                                // IE has trouble directly removing the expando
                                // but it's ok with using removeAttribute
-                               elem.removeAttribute( expando );
+                               if ( elem.removeAttribute )
+                                       elem.removeAttribute( expando );
                        }
 
                        // Completely remove the data cache
@@ -1020,7 +1031,7 @@ jQuery.each({
        next: "jQuery.nth(a,2,'nextSibling')",
        prev: "jQuery.nth(a,2,'previousSibling')",
        nextAll: "jQuery.dir(a,'nextSibling')",
-       prevtAll: "jQuery.dir(a,'previousSibling')",
+       prevAll: "jQuery.dir(a,'previousSibling')",
        siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
        children: "jQuery.sibling(a.firstChild)",
        contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"