X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=eb135400a8d7fa506dab1347e75cd59264ce76bb;hb=82eccdfcd0ba2e97c3fb7abac20b1146fbce5b2d;hp=67cb147c774e03e61a7088075f81b8e4bdeb3442;hpb=b59c94d5c23c0b1ec4b2506be0aed6b0578f19f3;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 67cb147..eb13540 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;
@@ -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,18 +513,22 @@ 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
 		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 );
+			if ( jQuery.cache[ id ] ) {
+				// 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 {
@@ -526,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
@@ -1014,9 +1027,11 @@ jQuery.extend({
 
 jQuery.each({
 	parent: "a.parentNode",
-	parents: "jQuery.parents(a)",
+	parents: "jQuery.dir(a,'parentNode')",
 	next: "jQuery.nth(a,2,'nextSibling')",
 	prev: "jQuery.nth(a,2,'previousSibling')",
+	nextAll: "jQuery.dir(a,'nextSibling')",
+	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)"
@@ -1078,10 +1093,20 @@ jQuery.each( {
 	};
 });
 
-jQuery.each( [ "height", "width" ], function(i,n){
+jQuery.each( [ "Height", "Width" ], function(i,name){
+	var n = name.toLowerCase();
+	
 	jQuery.fn[ n ] = function(h) {
-		return h == undefined ?
-			( this.length ? jQuery.css( this[0], n ) : null ) :
-			this.css( n, h.constructor == String ? h : h + "px" );
+		return this[0] == window ?
+			jQuery.browser.safari && self["inner" + name] ||
+			jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) ||
+			document.body["client" + name] :
+		
+			this[0] == document ?
+				Math.max( document.body["scroll" + name], document.body["offset" + name] ) :
+        
+				h == undefined ?
+					( this.length ? jQuery.css( this[0], n ) : null ) :
+					this.css( n, h.constructor == String ? h : h + "px" );
 	};
 });