X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=e2d3b60f75820f0a61cb6118625f0801e3314db8;hb=0f0fd1aee34b81411419ae3b152e03dfdf58b4f4;hp=b82133635fb2d19f0a34eec81f7daeac4e8ae6d0;hpb=93be758de94b2d4a76fca217465c9e09b613cedd;p=jquery.git

diff --git a/src/core.js b/src/core.js
index b821336..e2d3b60 100644
--- a/src/core.js
+++ b/src/core.js
@@ -29,10 +29,10 @@ var jQuery = function( selector, context ) {
 	rnotwhite = /\S/,
 
 	// Used for trimming whitespace
-	rtrim = /^\s+|\s+$/g,
+	rtrim = /(\s|\u00A0)+|(\s|\u00A0)+$/g,
 
 	// Match a standalone tag
-	rsingleTag = /<(\w+)\s*\/?>(?:<\/\1>)?$/,
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
 
 	// Keep a UserAgent string for use with jQuery.browser
 	userAgent = navigator.userAgent.toLowerCase(),
@@ -132,9 +132,9 @@ jQuery.fn = jQuery.prototype = {
 			this.context = selector.context;
 		}
 
-		return this.setArray(jQuery.isArray( selector ) ?
-			selector :
-			jQuery.makeArray(selector));
+		return jQuery.isArray( selector ) ?
+			this.setArray( selector ) :
+			jQuery.makeArray( selector, this );
 	},
 
 	// Start with an empty selector
@@ -315,7 +315,7 @@ jQuery.extend({
 	},
 
 	isObjectLiteral: function( obj ) {
-		if ( toString.call(obj) !== "[object Object]" ) {
+		if ( toString.call(obj) !== "[object Object]" || typeof obj.nodeType === "number" ) {
 			return false;
 		}
 		
@@ -419,19 +419,16 @@ jQuery.extend({
 		return (text || "").replace( rtrim, "" );
 	},
 
-	makeArray: function( array ) {
-		var ret = [], i;
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
 
 		if ( array != null ) {
-			i = array.length;
-
 			// The window, strings (and functions) also have 'length'
-			if ( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
-				ret[0] = array;
+			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
+				push.call( ret, array );
 			} else {
-				while ( i ) {
-					ret[--i] = array[i];
-				}
+				jQuery.merge( ret, array );
 			}
 		}
 
@@ -453,12 +450,21 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		// We have to loop this way because IE & Opera overwrite the length
-		// expando of getElementsByTagName
-		var i = 0, elem, pos = first.length;
+		var pos, i = second.length;
 
-		while ( (elem = second[ i++ ]) != null ) {
-			first[ pos++ ] = elem;
+		// We have to get length this way when IE & Opera overwrite the length
+		// expando of getElementsByTagName
+		if ( i && i.nodeType ) {
+			for ( i = 0; second[i]; ++i ) {}
+		}
+		
+		pos = i + first.length;
+		
+		// Correct length for non Arrays
+		first.length = pos;
+		
+		while ( i ) {
+			first[ --pos ] = second[ --i ];
 		}
 
 		return first;