X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=7ff9d15cdfa2ca0b1852bf80b8a29537c96f6c6b;hb=f094c803deba3c35c66f9dc0923db800fb088753;hp=b3142d0c67af426ee90b9782fc6a3501a57015f1;hpb=d75c899fe78c52d89e5fb757ded979aca126d37b;p=jquery.git

diff --git a/src/core.js b/src/core.js
index b3142d0..7ff9d15 100644
--- a/src/core.js
+++ b/src/core.js
@@ -10,7 +10,9 @@ var
 
 	jQuery = window.jQuery = window.$ = function( selector, context ) {
 		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
+		return selector === undefined ?
+			rootjQuery :
+			new jQuery.fn.init( selector, context );
 	},
 
 	// A simple way to check for HTML strings or ID strings
@@ -21,8 +23,11 @@ var
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
-		// Make sure that a selection was provided
-		selector = selector || document;
+		// Handle $("") or $(null)
+		if ( !selector ) {
+			this.length = 0;
+			return this;
+		}
 
 		// Handle $(DOMElement)
 		if ( selector.nodeType ) {
@@ -31,6 +36,7 @@ jQuery.fn = jQuery.prototype = {
 			this.context = selector;
 			return this;
 		}
+
 		// Handle HTML strings
 		if ( typeof selector === "string" ) {
 			// Are we dealing with HTML string or an ID?
@@ -40,34 +46,41 @@ jQuery.fn = jQuery.prototype = {
 			if ( match && (match[1] || !context) ) {
 
 				// HANDLE: $(html) -> $(array)
-				if ( match[1] )
+				if ( match[1] ) {
 					selector = jQuery.clean( [ match[1] ], context );
 
 				// HANDLE: $("#id")
-				else {
+				} else {
 					var 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 jQuery().find( selector );
+					if ( elem && elem.id != match[3] ) {
+						return rootjQuery.find( selector );
+					}
 
 					// Otherwise, we inject the element directly into the jQuery object
-					var ret = jQuery( elem || [] );
+					var ret = jQuery( elem || null );
 					ret.context = document;
 					ret.selector = selector;
 					return ret;
 				}
 
-			// HANDLE: $(expr, [context])
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return (context || rootjQuery).find( selector );
+
+			// HANDLE: $(expr, context)
 			// (which is just equivalent to: $(content).find(expr)
-			} else
+			} else {
 				return jQuery( context ).find( selector );
+			}
 
 		// HANDLE: $(function)
 		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) )
-			return jQuery( document ).ready( selector );
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
 
 		// Make sure that old selector state is passed along
 		if ( selector.selector && selector.context ) {
@@ -75,7 +88,9 @@ jQuery.fn = jQuery.prototype = {
 			this.context = selector.context;
 		}
 
-		return this.setArray(jQuery.makeArray(selector));
+		return this.setArray(jQuery.isArray( selector ) ?
+			selector :
+			jQuery.makeArray(selector));
 	},
 
 	// Start with an empty selector
@@ -95,7 +110,7 @@ jQuery.fn = jQuery.prototype = {
 		return num === undefined ?
 
 			// Return a 'clean' array
-			jQuery.makeArray( this ) :
+			Array.prototype.slice.call( this ) :
 
 			// Return just the object
 			this[ num ];
@@ -105,7 +120,7 @@ jQuery.fn = jQuery.prototype = {
 	// (returning the new matched element set)
 	pushStack: function( elems, name, selector ) {
 		// Build a new jQuery matched element set
-		var ret = jQuery( elems );
+		var ret = jQuery( elems || null );
 
 		// Add the old object onto the stack (as a reference)
 		ret.prevObject = this;
@@ -261,24 +276,36 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	end: function() {
-		return this.prevObject || jQuery( [] );
+		return this.prevObject || jQuery(null);
 	},
 
 	// For internal use only.
-	// Behaves like an Array's .push method, not like a jQuery method.
+	// Behaves like an Array's method, not like a jQuery method.
 	push: [].push,
+	sort: [].sort,
+	splice: [].splice,
 
 	find: function( selector ) {
-		if ( this.length === 1 ) {
-			var ret = this.pushStack( [], "find", selector );
-			ret.length = 0;
-			jQuery.find( selector, this[0], ret );
-			return ret;
-		} else {
-			return this.pushStack( jQuery.unique(jQuery.map(this, function(elem){
-				return jQuery.find( selector, elem );
-			})), "find", selector );
+		var ret = this.pushStack( "", "find", selector ), length = 0;
+
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( var n = length; n < ret.length; n++ ) {
+					for ( var r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
 		}
+
+		return ret;
 	},
 
 	clone: function( events ) {
@@ -498,13 +525,13 @@ jQuery.fn = jQuery.prototype = {
 		if ( this[0] ) {
 			var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(),
 				scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ),
-				first = fragment.firstChild,
-				extra = this.length > 1 ? fragment.cloneNode(true) : fragment;
+				first = fragment.firstChild;
 
 			if ( first )
 				for ( var i = 0, l = this.length; i < l; i++ )
-					callback.call( root(this[i], first), i > 0 ? extra.cloneNode(true) : fragment );
-			
+					callback.call( root(this[i], first), this.length > 1 || i > 0 ?
+							fragment.cloneNode(true) : fragment );
+		
 			if ( scripts )
 				jQuery.each( scripts, evalScript );
 		}
@@ -1142,6 +1169,9 @@ jQuery.extend({
 	}
 });
 
+// All jQuery objects should point back to these
+var rootjQuery = jQuery(document);
+
 // Use of jQuery.browser is deprecated.
 // It's included for backwards compatibility and plugins,
 // although they should work to migrate away.
@@ -1185,13 +1215,16 @@ jQuery.each({
 	insertAfter: "after",
 	replaceAll: "replaceWith"
 }, function(name, original){
-	jQuery.fn[ name ] = function() {
-		var args = arguments;
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [], insert = jQuery( selector );
 
-		return this.each(function(){
-			for ( var i = 0, length = args.length; i < length; i++ )
-				jQuery( args[ i ] )[ original ]( this );
-		});
+		for ( var i = 0, l = insert.length; i < l; i++ ) {
+			var elems = (i > 0 ? this.clone(true) : this).get();
+			jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+			ret = ret.concat( elems );
+		}
+
+		return this.pushStack( ret, name, selector );
 	};
 });
 
@@ -1217,24 +1250,28 @@ jQuery.each({
 	},
 
 	remove: function( selector ) {
-		if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
-			// Prevent memory leaks
-			jQuery( "*", this ).add([this]).each(function(){
-				jQuery.event.remove(this);
-				jQuery.removeData(this);
-			});
-			if (this.parentNode)
+		if ( !selector || jQuery.multiFilter( selector, [ this ] ).length ) {
+			if ( this.nodeType === 1 ) {
+				cleanData( this.getElementsByTagName("*") );
+				cleanData( [this] );
+			}
+
+			if ( this.parentNode ) {
 				this.parentNode.removeChild( this );
+			}
 		}
 	},
 
 	empty: function() {
 		// Remove element nodes and prevent memory leaks
-		jQuery( ">*", this ).remove();
+		if ( this.nodeType === 1 ) {
+			cleanData( this.getElementsByTagName("*") );
+		}
 
 		// Remove any remaining nodes
-		while ( this.firstChild )
+		while ( this.firstChild ) {
 			this.removeChild( this.firstChild );
+		}
 	}
 }, function(name, fn){
 	jQuery.fn[ name ] = function(){
@@ -1242,6 +1279,15 @@ jQuery.each({
 	};
 });
 
+function cleanData( elems ) {
+	for ( var i = 0, l = elems.length; i < l; i++ ) {
+		var id = elems[i][expando];
+		if ( id ) {
+			delete jQuery.cache[ id ];
+		}
+	}
+}
+
 // Helper function used by the dimensions and offset modules
 function num(elem, prop) {
 	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;