X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore.js;h=18ecf21f000d51b4630022441c2a35d5015e9ba5;hb=03de2cb5e7945fac42bc612b290dbe460924cc51;hp=a71656d06f0a6e3432db5015ac90e9b42b82ca77;hpb=a38a5cd531a328319f8b7f3f33a84044b54591ce;p=jquery.git

diff --git a/src/core.js b/src/core.js
index a71656d..18ecf21 100644
--- a/src/core.js
+++ b/src/core.js
@@ -25,6 +25,12 @@ 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(),
 
@@ -39,16 +45,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 +70,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,6 +118,9 @@ 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;
@@ -133,7 +137,7 @@ jQuery.fn = jQuery.prototype = {
 			this.toArray() :
 
 			// Return just the object
-			( num < 0 ? this.toArray.call(this, num)[0] : this[ num ] );
+			( num < 0 ? this.toArray(num)[ 0 ] : this[ num ] );
 	},
 
 	// Take an array of elements and push it onto the stack
@@ -305,7 +309,7 @@ jQuery.extend({
 
 	// 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,
@@ -368,7 +372,7 @@ jQuery.extend({
 	},
 
 	trim: function( text ) {
-		return (text || "").replace( /^\s+|\s+$/g, "" );
+		return (text || "").replace( rtrim, "" );
 	},
 
 	makeArray: function( array ) {
@@ -476,7 +480,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 ),