X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore.js;h=1edf98edcaceeb5c80c68d4c69a643628fea3404;hb=aa81bb5e458efd25981933c339ac1a0090e6eb0f;hp=6e41eb9f474a0cb7c05f44fc1391a5ac4c9a39dc;hpb=ede2f2c4f76aba3c0a279d8ca26e8176942cd83f;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 6e41eb9..1edf98e 100644
--- a/src/core.js
+++ b/src/core.js
@@ -41,6 +41,9 @@ var jQuery = function( selector, context ) {
 	// The functions to execute on DOM ready
 	readyList = [],
 
+	// The ready event handler
+	DOMContentLoaded,
+
 	// Save a reference to some core methods
 	toString = Object.prototype.toString,
 	hasOwnProperty = Object.prototype.hasOwnProperty,
@@ -210,43 +213,53 @@ jQuery.fn = jQuery.prototype = {
 	each: function( callback, args ) {
 		return jQuery.each( this, callback, args );
 	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
-		}
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	is: function( selector ) {
-		return !!selector && jQuery.filter( selector, this ).length > 0;
-	},
 	
 	ready: function( fn ) {
 		// Attach the listeners
 		jQuery.bindReady();
 
 		// If the DOM is already ready
-		if ( jQuery.isReady && !readyList ) {
+		if ( jQuery.isReady ) {
 			// Execute the function immediately
 			fn.call( document, jQuery );
 
 		// Otherwise, remember the function for later
-		} else {
+		} else if ( readyList ) {
 			// Add the function to the wait list
 			readyList.push( fn );
 		}
 
 		return this;
 	},
+	
+	eq: function( i ) {
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, +i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function(elem, i){
+			return callback.call( elem, i, elem );
+		}));
+	},
+	
+	end: function() {
+		return this.prevObject || jQuery(null);
+	},
 
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
@@ -332,6 +345,7 @@ jQuery.extend({
 	ready: function() {
 		// Make sure that the DOM is not already loaded
 		if ( !jQuery.isReady ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
 			if ( !document.body ) {
 				return setTimeout( jQuery.ready, 13 );
 			}
@@ -371,10 +385,7 @@ jQuery.extend({
 		// Mozilla, Opera and webkit nightlies currently support this event
 		if ( document.addEventListener ) {
 			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", function DOMContentLoaded() {
-				document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-				jQuery.ready();
-			}, false );
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
 			
 			// A fallback to window.onload, that will always work
 			window.addEventListener( "load", jQuery.ready, false );
@@ -383,13 +394,7 @@ jQuery.extend({
 		} else if ( document.attachEvent ) {
 			// ensure firing before onload,
 			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", function onreadystatechange() {
-				// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-				if ( document.readyState === "complete" ) {
-					document.detachEvent( "onreadystatechange", onreadystatechange );
-					jQuery.ready();
-				}
-			});
+			document.attachEvent("onreadystatechange", DOMContentLoaded);
 			
 			// A fallback to window.onload, that will always work
 			window.attachEvent( "onload", jQuery.ready );
@@ -404,24 +409,6 @@ jQuery.extend({
 
 			if ( document.documentElement.doScroll && toplevel ) {
 				doScrollCheck();
-
-				function doScrollCheck() {
-					if ( jQuery.isReady ) {
-						return;
-					}
-
-					try {
-						// If IE is used, use the trick by Diego Perini
-						// http://javascript.nwbox.com/IEContentLoaded/
-						document.documentElement.doScroll("left");
-					} catch( error ) {
-						setTimeout( doScrollCheck, 1 );
-						return;
-					}
-
-					// and execute any waiting functions
-					jQuery.ready();
-				}
 			}
 		}
 	},
@@ -638,6 +625,48 @@ if ( indexOf ) {
 // All jQuery objects should point back to these
 rootjQuery = jQuery(document);
 
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch( error ) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+if ( indexOf ) {
+	jQuery.inArray = function( elem, array ) {
+		return indexOf.call( array, elem );
+	};
+}
+
 function evalScript( i, elem ) {
 	if ( elem.src ) {
 		jQuery.ajax({