From: jeresig <jeresig@gmail.com>
Date: Thu, 23 Sep 2010 16:09:49 +0000 (-0400)
Subject: Merge branch 'master' of github.com:jquery/jquery
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=6dfdb14753c66cfd38f8445bd6119ef4a1274d5e;hp=-c;p=jquery.git

Merge branch 'master' of github.com:jquery/jquery
---

6dfdb14753c66cfd38f8445bd6119ef4a1274d5e
diff --combined src/core.js
index 158f479,f6a07eb..2c2b746
--- a/src/core.js
+++ b/src/core.js
@@@ -69,10 -69,7 +69,10 @@@ var jQuery = function( selector, contex
  	push = Array.prototype.push,
  	slice = Array.prototype.slice,
  	trim = String.prototype.trim,
 -	indexOf = Array.prototype.indexOf;
 +	indexOf = Array.prototype.indexOf,
 +	
 +	// [[Class]] -> type pairs
 +	class2type = {};
  
  jQuery.fn = jQuery.prototype = {
  	init: function( selector, context ) {
@@@ -309,7 -306,7 +309,7 @@@ jQuery.fn.init.prototype = jQuery.fn
  
  jQuery.extend = jQuery.fn.extend = function() {
  	// copy reference to target object
 -	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
 +	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy, copyIsArray;
  
  	// Handle a deep copy situation
  	if ( typeof target === "boolean" ) {
@@@ -343,15 -340,10 +343,15 @@@
  					continue;
  				}
  
 -				// Recurse if we're merging object literal values or arrays
 -				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
 -					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
 -						: jQuery.isArray(copy) ? [] : {};
 +				// Recurse if we're merging plain objects or arrays
 +				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
 +					if ( copyIsArray ) {
 +						copyIsArray = false;
 +						clone = src && jQuery.isArray(src) ? src : [];
 +
 +					} else {
 +						clone = src && jQuery.isPlainObject(src) ? src : {};
 +					}
  
  					// Never move original objects, clone them
  					target[ name ] = jQuery.extend( deep, clone, copy );
@@@ -437,7 -429,8 +437,8 @@@ jQuery.extend(
  		// Catch cases where $(document).ready() is called after the
  		// browser event has already occurred.
  		if ( document.readyState === "complete" ) {
- 			return jQuery.ready();
+ 			// Handle it asynchronously to allow scripts the opportunity to delay ready
+ 			return setTimeout( jQuery.ready, 13 );
  		}
  
  		// Mozilla, Opera and webkit nightlies currently support this event
@@@ -490,7 -483,7 +491,7 @@@
  	type: function( obj ) {
  		return obj == null ?
  			String( obj ) :
 -			toString.call(obj).slice(8, -1).toLowerCase();
 +			class2type[ toString.call(obj) ] || "object";
  	},
  
  	isPlainObject: function( obj ) {
@@@ -802,11 -795,6 +803,11 @@@
  	browser: {}
  });
  
 +// Populate the class2type map
 +jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
 +	class2type[ "[object " + name + "]" ] = name.toLowerCase();
 +});
 +
  browserMatch = jQuery.uaMatch( userAgent );
  if ( browserMatch.browser ) {
  	jQuery.browser[ browserMatch.browser ] = true;