X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=cb9b528eca4d46b149bc0f947db4bc5acd691cb4;hb=26eda09892459709d224f910038b8f6836bfd012;hp=1721bdacf7bb46136735d4b89392e65b251aacb8;hpb=e532dfe5228217f55a33122a4438fd70522dbb4b;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 1721bda..cb9b528 100644
--- a/src/core.js
+++ b/src/core.js
@@ -25,11 +25,19 @@ var jQuery = function( selector, context ) {
 	// Is it a simple selector
 	isSimple = /^.[^:#\[\.,]*$/,
 
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	rtrim = /^\s+|\s+$/g,
+
 	// Keep a UserAgent string for use with jQuery.browser
 	userAgent = navigator.userAgent.toLowerCase(),
 
-	// Save a reference to the core toString method
-	toString = Object.prototype.toString;
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice;
 
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
@@ -39,16 +47,12 @@ jQuery.fn = jQuery.prototype = {
 		var match, elem, ret;
 
 		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			this.length = 0;
-			return this;
-		}
+		if ( !selector ) return this;
 
 		// Handle $(DOMElement)
 		if ( selector.nodeType ) {
-			this[0] = selector;
-			this.length = 1;
-			this.context = selector;
+			this.context = this[0] = selector;
+			this.length++;
 			return this;
 		}
 
@@ -68,17 +72,16 @@ jQuery.fn = jQuery.prototype = {
 				} else {
 					elem = document.getElementById( match[3] );
 
-					// Handle the case where IE and Opera return items
-					// by name instead of ID
-					if ( elem && elem.id !== match[3] ) {
-						return rootjQuery.find( selector );
-					}
-
-					// Otherwise, we inject the element directly into the jQuery object
-					this.length = elem ? 1 : 0;
 					if ( elem ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[3] ) return rootjQuery.find( selector );
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length++;
 						this[0] = elem;
 					}
+
 					this.context = document;
 					this.selector = selector;
 					return this;
@@ -117,12 +120,17 @@ jQuery.fn = jQuery.prototype = {
 	// The current version of jQuery being used
 	jquery: "@VERSION",
 
+	// The default length of a jQuery object is 0
+	length: 0,
+
 	// The number of elements contained in the matched element set
 	size: function() {
 		return this.length;
 	},
 
-	toArray: Array.prototype.slice,
+	toArray: function(){
+		return slice.call( this, 0 );
+	},
 
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
@@ -133,7 +141,7 @@ jQuery.fn = jQuery.prototype = {
 			this.toArray() :
 
 			// Return just the object
-			( num < 0 ? this.toArray.call(this, num)[0] : this[ num ] );
+			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
 	},
 
 	// Take an array of elements and push it onto the stack
@@ -164,7 +172,7 @@ jQuery.fn = jQuery.prototype = {
 		// Resetting the length to 0, then using the native Array push
 		// is a super-fast way to populate an object with array-like properties
 		this.length = 0;
-		Array.prototype.push.apply( this, elems );
+		push.apply( this, elems );
 
 		return this;
 	},
@@ -197,7 +205,7 @@ jQuery.fn = jQuery.prototype = {
 
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
-	push: [].push,
+	push: push,
 	sort: [].sort,
 	splice: [].splice
 };
@@ -243,9 +251,20 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 				// Recurse if we're merging object values
 				if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
-					target[ name ] = jQuery.extend( deep,
-						// Never move original objects, clone them
-						src || ( copy.length != null ? [ ] : { } ), copy );
+					var clone;
+
+					if ( src ) {
+						clone = src;
+					} else if ( jQuery.isArray(copy) ) {
+						clone = [];
+					} else if ( jQuery.isObject(copy) ) {
+						clone = {};
+					} else {
+						clone = copy;
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
 
 				// Don't bring in undefined values
 				} else if ( copy !== undefined ) {
@@ -281,21 +300,32 @@ jQuery.extend({
 		return toString.call(obj) === "[object Array]";
 	},
 
+	isObject: function( obj ) {
+		return this.constructor.call(obj) === Object;
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
 	// check if an element is in a (or is an) XML document
 	isXMLDoc: function( elem ) {
-		return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
-			!!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML";
+		return (elem.ownerDocument || elem).documentElement.nodeName !== "HTML";
 	},
 
 	// Evalulates a script in a global context
 	globalEval: function( data ) {
-		if ( data && /\S/.test(data) ) {
+		if ( data && rnotwhite.test(data) ) {
 			// Inspired by code by Andrea Giammarchi
 			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
 			var head = document.getElementsByTagName("head")[0] || document.documentElement,
 				script = document.createElement("script");
 
 			script.type = "text/javascript";
+
 			if ( jQuery.support.scriptEval ) {
 				script.appendChild( document.createTextNode( data ) );
 			} else {
@@ -352,7 +382,7 @@ jQuery.extend({
 	},
 
 	trim: function( text ) {
-		return (text || "").replace( /^\s+|\s+$/g, "" );
+		return (text || "").replace( rtrim, "" );
 	},
 
 	makeArray: function( array ) {
@@ -460,7 +490,7 @@ jQuery.extend({
 	// It's included for backwards compatibility and plugins,
 	// although they should work to migrate away.
 	browser: {
-		version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
+		version: (/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/.exec(userAgent) || [0,'0'])[1],
 		safari: /webkit/.test( userAgent ),
 		opera: /opera/.test( userAgent ),
 		msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),