X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=ac45d6275daee8119a535ff705dd15198afd2692;hb=3a4e1233aa2acabee0d0267d54c2d1112fbdcad4;hp=537b4e2bec7a6b250e435ad4cf97ac827d45c3a6;hpb=6728e3cf74d02794113deb0af70a5f9a7caa2241;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 537b4e2..ac45d62 100644
--- a/src/core.js
+++ b/src/core.js
@@ -228,44 +228,25 @@ jQuery.fn = jQuery.prototype = {
 			jQuery.unique( data ) : data );
 	},
 
-	clone: function() {
-		var $this = this.add(this.find("*"));
-		if (jQuery.browser.msie) {
-			// Need to remove events on the element and its descendants
-			$this.each(function() {
-				this._$events = {};
-				for (var type in this.$events)
-					this._$events[type] = jQuery.extend({},this.$events[type]);
-			}).unbind();
-		}
-
+	clone: function(events) {
 		// Do the clone
-		var r = this.pushStack( jQuery.map( this, function(a){
-			return a.cloneNode( true );
-		}) );
-
-		if (jQuery.browser.msie) {
-			$this.each(function() {
-				// Add the events back to the original and its descendants
-				var events = this._$events;
-				for (var type in events)
-					for (var handler in events[type])
-						jQuery.event.add(this, type, events[type][handler], events[type][handler].data);
-				this._$events = null;
+		var ret = this.map(function(){
+			return this.outerHTML ? jQuery(this.outerHTML)[0] : this.cloneNode(true);
+		});
+		
+		if (events === true) {
+			var clone = ret.find("*").andSelf();
+
+			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);
 			});
 		}
 
-		// copy form values over
-		var inputs = r.add(r.find('*')).filter('select,input[@type=checkbox]');
-		$this.filter('select,input[@type=checkbox]').each(function(i) {
-			if (this.selectedIndex)
-				inputs[i].selectedIndex = this.selectedIndex;
-			if (this.checked)
-				inputs[i].checked = true;
-		});
-
 		// Return the cloned set
-		return r;
+		return ret;
 	},
 
 	filter: function(t) {
@@ -304,6 +285,10 @@ jQuery.fn = jQuery.prototype = {
 	is: function(expr) {
 		return expr ? jQuery.multiFilter(expr,this).length > 0 : false;
 	},
+
+	hasClass: function(expr) {
+		return this.is("." + expr);
+	},
 	
 	val: function( val ) {
 		if ( val == undefined ) {
@@ -426,6 +411,8 @@ jQuery.extend = jQuery.fn.extend = function() {
 	return target;
 };
 
+var expando = "jQuery" + (new Date()).getTime(), uuid = 0;
+
 jQuery.extend({
 	noConflict: function(deep) {
 		window.$ = _$;
@@ -465,6 +452,58 @@ jQuery.extend({
 	nodeName: function( elem, name ) {
 		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
 	},
+	
+	cache: {},
+	
+	data: function( elem, name, data ) {
+		var id = elem[ expando ];
+
+		// Compute a unique ID for the element
+		if ( !id ) 
+			id = elem[ expando ] = ++uuid;
+
+		// Only generate the data cache if we're
+		// trying to access or manipulate it
+		if ( name && !jQuery.cache[ id ] )
+			jQuery.cache[ id ] = {};
+		
+		// Prevent overriding the named cache with undefined values
+		if ( data != undefined )
+			jQuery.cache[ id ][ name ] = data;
+		
+		// Return the named cache data, or the ID for the element	
+		return name ? jQuery.cache[ id ][ name ] : id;
+	},
+	
+	removeData: function( elem, name ) {
+		var id = elem[ expando ];
+
+		// If we want to remove a specific section of the element's data
+		if ( name ) {
+			// Remove the section of cache data
+			delete jQuery.cache[ id ][ name ];
+
+			// If we've removed all the data, remove the element's cache
+			name = "";
+			for ( name in jQuery.cache[ id ] ) break;
+			if ( !name )
+				jQuery.removeData( elem );
+
+		// Otherwise, we want to remove all of the element's data
+		} else {
+			// Clean up the element expando
+			try {
+				delete elem[ expando ];
+			} catch(e){
+				// IE has trouble directly removing the expando
+				// but it's ok with using removeAttribute
+				elem.removeAttribute( expando );
+			}
+
+			// Completely remove the data cache
+			delete jQuery.cache[ id ];
+		}
+	},
 
 	// args is for internal usage only
 	each: function( obj, fn, args ) {
@@ -851,14 +890,16 @@ jQuery.extend({
 	},
 
 	unique: function(first) {
-		var r = [], num = jQuery.mergeNum++;
+		var r = [], done = {};
 
 		try {
-			for ( var i = 0, fl = first.length; i < fl; i++ )
-				if ( num != first[i].mergeNum ) {
-					first[i].mergeNum = num;
+			for ( var i = 0, fl = first.length; i < fl; i++ ) {
+				var id = jQuery.data(first[i]);
+				if ( !done[id] ) {
+					done[id] = true;
 					r.push(first[i]);
 				}
+			}
 		} catch(e) {
 			r = first;
 		}
@@ -866,8 +907,6 @@ jQuery.extend({
 		return r;
 	},
 
-	mergeNum: 0,
-
 	grep: function(elems, fn, inv) {
 		// If a string is passed in for the function, make a function
 		// for it (a handy shortcut)
@@ -992,10 +1031,15 @@ jQuery.each( {
 		jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
 	},
 	remove: function(a){
-		if ( !a || jQuery.filter( a, [this] ).r.length )
+		if ( !a || jQuery.filter( a, [this] ).r.length ) {
+			jQuery.removeData( this );
 			this.parentNode.removeChild( this );
+		}
 	},
 	empty: function() {
+		// Clean up the cache
+		jQuery("*", this).each(function(){ jQuery.removeData(this); });
+
 		while ( this.firstChild )
 			this.removeChild( this.firstChild );
 	}