X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=d9749ba49b2aea9972045e90859f2be9e471beac;hb=d5f2129ac49e04185b49b7d5a548efa451d31dbc;hp=c1e7d9f1b1a65377bd34d1630bcc536b8a490ca5;hpb=cd6ec6e157f78ab6810ae79c88ebdf6300d5d458;p=jquery.git

diff --git a/src/core.js b/src/core.js
index c1e7d9f..d9749ba 100644
--- 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;
@@ -388,18 +394,32 @@ jQuery.fn = jQuery.prototype = {
 				obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
 
 			jQuery.each( a, function(){
-				if ( jQuery.nodeName(this, "script") ) {
-					if ( this.src )
-						jQuery.ajax({ url: this.src, async: false, dataType: "script" });
-					else
-						jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
-				} else
-					fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+				var elem = clone ? this.cloneNode(true) : this;
+				if ( !evalScript(0, elem) )
+					fn.call( obj, elem );
 			});
 		});
 	}
 };
 
+function evalScript(i, elem){
+	var script = jQuery.nodeName(elem, "script");
+
+	if ( script ) {
+		if ( elem.src )
+			jQuery.ajax({ url: elem.src, async: false, dataType: "script" });
+		else
+			jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	
+		if ( elem.parentNode )
+			elem.parentNode.removeChild(elem);
+
+	} else if ( elem.nodeType == 1 )
+    jQuery("script", elem).each(evalScript);
+
+	return script;
+}
+
 jQuery.extend = jQuery.fn.extend = function() {
 	// copy reference to target object
 	var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
@@ -440,7 +460,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 +505,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 +527,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 +552,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 +1045,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)"