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

diff --git a/src/core.js b/src/core.js
index c1e7d9f..92945a4 100644
--- a/src/core.js
+++ b/src/core.js
@@ -13,12 +13,11 @@
 if ( typeof jQuery != "undefined" )
 	var _jQuery = jQuery;
 
-var jQuery = window.jQuery = function(a,c) {
-	// If the context is global, return a new object
-	if ( window == this || !this.init )
-		return new jQuery(a,c);
-	
-	return this.init(a,c);
+var jQuery = window.jQuery = function(selector, context) {
+	// If the context is a namespace object, return a new object
+	return this instanceof jQuery ?
+		this.init(selector, context) :
+		new jQuery(selector, context);
 };
 
 // Map over the $ in case of overwrite
@@ -31,17 +30,17 @@ window.$ = jQuery;
 var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
 
 jQuery.fn = jQuery.prototype = {
-	init: function(a,c) {
+	init: function(selector, context) {
 		// Make sure that a selection was provided
-		a = a || document;
+		selector = selector || document;
 
 		// Handle HTML strings
-		if ( typeof a  == "string" ) {
-			var m = quickExpr.exec(a);
-			if ( m && (m[1] || !c) ) {
+		if ( typeof selector  == "string" ) {
+			var m = quickExpr.exec(selector);
+			if ( m && (m[1] || !context) ) {
 				// HANDLE: $(html) -> $(array)
 				if ( m[1] )
-					a = jQuery.clean( [ m[1] ], c );
+					selector = jQuery.clean( [ m[1] ], context );
 
 				// HANDLE: $("#id")
 				else {
@@ -50,35 +49,35 @@ jQuery.fn = jQuery.prototype = {
 						// Handle the case where IE and Opera return items
 						// by name instead of ID
 						if ( tmp.id != m[3] )
-							return jQuery().find( a );
+							return jQuery().find( selector );
 						else {
 							this[0] = tmp;
 							this.length = 1;
 							return this;
 						}
 					else
-						a = [];
+						selector = [];
 				}
 
 			// HANDLE: $(expr)
 			} else
-				return new jQuery( c ).find( a );
+				return new jQuery( context ).find( selector );
 
 		// HANDLE: $(function)
 		// Shortcut for document ready
-		} else if ( jQuery.isFunction(a) )
-			return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+		} else if ( jQuery.isFunction(selector) )
+			return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( selector );
 
 		return this.setArray(
 			// HANDLE: $(array)
-			a.constructor == Array && a ||
+			selector.constructor == Array && selector ||
 
 			// HANDLE: $(arraylike)
 			// Watch for when an array-like object is passed as the selector
-			(a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+			(selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) ||
 
 			// HANDLE: $(*)
-			[ a ] );
+			[ selector ] );
 	},
 	
 	jquery: "@VERSION",
@@ -233,17 +232,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;
@@ -277,7 +282,7 @@ jQuery.fn = jQuery.prototype = {
 			this.get(),
 			t.constructor == String ?
 				jQuery(t).get() :
-				t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
+				t.length != undefined && (!t.nodeName || jQuery.nodeName(t, "form")) ?
 					t : [t] )
 		);
 	},
@@ -358,6 +363,10 @@ jQuery.fn = jQuery.prototype = {
 		return this.after( val ).remove();
 	},
 
+	eq: function(i){
+		return this.slice(i, i+1);
+	},
+
 	slice: function() {
 		return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
 	},
@@ -388,18 +397,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 +463,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 +508,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 +530,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 +555,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
@@ -1010,7 +1038,8 @@ jQuery.extend({
 		checked: "checked",
 		readonly: "readOnly",
 		selected: "selected",
-		maxlength: "maxLength"
+		maxlength: "maxLength",
+		selectedIndex: "selectedIndex"
 	}
 });
 
@@ -1020,7 +1049,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)"
@@ -1086,16 +1115,27 @@ jQuery.each( [ "Height", "Width" ], function(i,name){
 	var n = name.toLowerCase();
 	
 	jQuery.fn[ n ] = function(h) {
+		// Get window width or height
 		return this[0] == window ?
+			// Opera reports document.body.client[Width/Height] properly in both quirks and standards
+			jQuery.browser.opera && document.body["client" + name] || 
+			
+			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
 			jQuery.browser.safari && self["inner" + name] ||
-			jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) ||
-			document.body["client" + name] :
+			
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			document.compatMode == "CSS1Compat" && document.documentElement["client" + name] || document.body["client" + name] :
 		
+		// Get document width or height
 			this[0] == document ?
+				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater (Mozilla reports scrollWidth the same as offsetWidth)
 				Math.max( document.body["scroll" + name], document.body["offset" + name] ) :
         
+		// Get or set width or height on the element
 				h == undefined ?
+					// Get width or height on the element
 					( this.length ? jQuery.css( this[0], n ) : null ) :
+					// Set the width or height on the element (default to pixels if value is unitless)
 					this.css( n, h.constructor == String ? h : h + "px" );
 	};
 });