X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=a6d4c5f74b2a8ee97bbd51fb3ccf11d6278a1737;hb=aec0dad98046bf4242eaf9015a2a41f9e008cc0c;hp=c9076b682d9a6a6b2c9c3494f47ae9af319f9d54;hpb=e5e24bd33f348f89bedc76b2b650a2b4c5a0a024;p=jquery.git

diff --git a/src/core.js b/src/core.js
index c9076b6..a6d4c5f 100644
--- a/src/core.js
+++ b/src/core.js
@@ -36,9 +36,9 @@ jQuery.fn = jQuery.prototype = {
 			this[0] = selector;
 			this.length = 1;
 			return this;
-
+		}
 		// Handle HTML strings
-		} else if ( typeof selector == "string" ) {
+		if ( typeof selector == "string" ) {
 			// Are we dealing with HTML string or an ID?
 			var match = quickExpr.exec( selector );
 
@@ -54,32 +54,27 @@ jQuery.fn = jQuery.prototype = {
 					var elem = document.getElementById( match[3] );
 
 					// Make sure an element was located
-					if ( elem )
+					if ( elem ){
 						// Handle the case where IE and Opera return items
 						// by name instead of ID
 						if ( elem.id != match[3] )
 							return jQuery().find( selector );
 
 						// Otherwise, we inject the element directly into the jQuery object
-						else {
-							this[0] = elem;
-							this.length = 1;
-							return this;
-						}
-
-					else
-						selector = [];
+						return jQuery( elem );
+					}
+					selector = [];
 				}
 
 			// HANDLE: $(expr, [context])
 			// (which is just equivalent to: $(content).find(expr)
 			} else
-				return new jQuery( context ).find( selector );
+				return jQuery( context ).find( selector );
 
 		// HANDLE: $(function)
 		// Shortcut for document ready
 		} else if ( jQuery.isFunction( selector ) )
-			return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
+			return jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
 		
 		return this.setArray(jQuery.makeArray(selector));
 	},
@@ -145,12 +140,10 @@ jQuery.fn = jQuery.prototype = {
 		var ret = -1;
 
 		// Locate the position of the desired element
-		this.each(function(i){
-			if ( this == elem )
-				ret = i;
-		});
-
-		return ret;
+		return jQuery.inArray( 
+			// If it receives a jQuery object, the first element is used
+			elem && elem.jquery ? elem[0] : elem
+		, this );
 	},
 
 	attr: function( name, value, type ) {
@@ -344,12 +337,12 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	add: function( selector ) {
-		return !selector ? this : this.pushStack( jQuery.merge( 
+		return this.pushStack( jQuery.unique( jQuery.merge( 
 			this.get(),
-			selector.constructor == String ? 
-				jQuery( selector ).get() :
-				selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ?
-					selector : [selector] ) );
+			typeof selector == 'string' ? 
+				jQuery( selector ) :
+				jQuery.makeArray( selector )
+		)));
 	},
 
 	is: function( selector ) {
@@ -1114,14 +1107,14 @@ jQuery.extend({
 	makeArray: function( array ) {
 		var ret = [];
 
-		if( array != undefined ){
+		if( array != null ){
 			var i = array.length;
 			//the window, strings and functions also have 'length'
-			if( i != null && !array.split && array != window && !array.call )
+			if( i == null || array.split || array.setInterval || array.call )
+				ret[0] = array;
+			else
 				while( i )
 					ret[--i] = array[i];
-			else
-				ret[0] = array;
 		}
 
 		return ret;
@@ -1129,7 +1122,8 @@ jQuery.extend({
 
 	inArray: function( elem, array ) {
 		for ( var i = 0, length = array.length; i < length; i++ )
-			if ( array[ i ] == elem )
+		// Use === because on IE, window == document
+			if ( array[ i ] === elem )
 				return i;
 
 		return -1;