X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=4c7b07eca87226591d2c87de4e75ab8f2e65911f;hb=715d1c5a30cc4986018bbf063713f14c34c3e258;hp=26f6e924a6eed8b1ccd5d0bdb91ab74bfbc4710c;hpb=00a0abb751055964e9f1de202540a11e545f73d6;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 26f6e92..4c7b07e 100644
--- a/src/core.js
+++ b/src/core.js
@@ -1,9 +1,7 @@
 // Define a local copy of jQuery
 var jQuery = function( selector, context ) {
 		// The jQuery object is actually just the init constructor 'enhanced'
-		return arguments.length === 0 ?
-			rootjQuery :
-			new jQuery.fn.init( selector, context );
+		return new jQuery.fn.init( selector, context );
 	},
 
 	// Map over jQuery in case of overwrite
@@ -237,7 +235,7 @@ jQuery.fn = jQuery.prototype = {
 		jQuery.bindReady();
 
 		// If the DOM is already ready
-		if ( jQuery.isReady ) {
+		if ( jQuery.isReady && !readyList ) {
 			// Execute the function immediately
 			fn.call( document, jQuery );
 
@@ -373,8 +371,8 @@ jQuery.extend({
 		// Mozilla, Opera and webkit nightlies currently support this event
 		if ( document.addEventListener ) {
 			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", function() {
-				document.removeEventListener( "DOMContentLoaded", arguments.callee, false );
+			document.addEventListener( "DOMContentLoaded", function DOMContentLoaded() {
+				document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
 				jQuery.ready();
 			}, false );
 			
@@ -385,10 +383,10 @@ jQuery.extend({
 		} else if ( document.attachEvent ) {
 			// ensure firing before onload,
 			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", function() {
+			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", arguments.callee );
+					document.detachEvent( "onreadystatechange", onreadystatechange );
 					jQuery.ready();
 				}
 			});
@@ -405,7 +403,9 @@ jQuery.extend({
 			} catch(e){}
 
 			if ( document.documentElement.doScroll && toplevel ) {
-				(function() {
+				doScrollCheck();
+
+				function doScrollCheck() {
 					if ( jQuery.isReady ) {
 						return;
 					}
@@ -415,13 +415,13 @@ jQuery.extend({
 						// http://javascript.nwbox.com/IEContentLoaded/
 						document.documentElement.doScroll("left");
 					} catch( error ) {
-						setTimeout( arguments.callee, 0 );
+						setTimeout( doScrollCheck, 1 );
 						return;
 					}
 
 					// and execute any waiting functions
 					jQuery.ready();
-				})();
+				}
 			}
 		}
 	},
@@ -444,8 +444,8 @@ jQuery.extend({
 		
 		// not own constructor property must be Object
 		if ( obj.constructor
-		  && !hasOwnProperty.call(obj, "constructor")
-		  && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			&& !hasOwnProperty.call(obj, "constructor")
+			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
 			return false;
 		}
 		
@@ -481,7 +481,7 @@ jQuery.extend({
 				script.text = data;
 			}
 
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
 			// This arises when a base node is used (#2709).
 			head.insertBefore( script, head.firstChild );
 			head.removeChild( script );
@@ -567,23 +567,20 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		var pos, i = second.length;
+		var i = first.length, j = 0;
 
-		// 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 ];
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
 		}
 
+		first.length = i;
+
 		return first;
 	},
 
@@ -618,18 +615,20 @@ jQuery.extend({
 		return ret.concat.apply( [], ret );
 	},
 
-	// Use of jQuery.browser is deprecated.
-	// It's included for backwards compatibility and plugins,
-	// although they should work to migrate away.
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
 	browser: {
-		version: (/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/.exec(userAgent) || [0,'0'])[1],
-		safari: /webkit/.test( userAgent ),
+		version: (/.*?(?:firefox|safari|opera|msie)[\/ ]([\d.]+)/.exec(userAgent) || [0,'0'])[1],
+		safari: /safari/.test( userAgent ),
 		opera: /opera/.test( userAgent ),
 		msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
-		mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
+		firefox: /firefox/.test( userAgent )
 	}
 });
 
+// Deprecated
+jQuery.browser.mozilla = /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent );
+
 if ( indexOf ) {
 	jQuery.inArray = function( elem, array ) {
 		return indexOf.call( array, elem );