X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=f116ef4d10b3e027befc18324eea9fb07a83d858;hb=265cf0efa7ab3296b3fc4917b863d7b09e3d8bb4;hp=0bf0cb4b7125c69243460b2d48c4cba4f45f6bf9;hpb=d483ce0a9c8b19dafa70be93ca071673b86a65e2;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 0bf0cb4..f116ef4 100644
--- a/src/core.js
+++ b/src/core.js
@@ -19,12 +19,8 @@ var jQuery = function( selector, context ) {
 	// (both of which we optimize for)
 	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,
 
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/,
-
 	// Check if a string has a non-whitespace character in it
 	rnotwhite = /\S/,
-	rwhite = /\s/,
 
 	// Used for trimming whitespace
 	trimLeft = /^\s+/,
@@ -63,6 +59,9 @@ var jQuery = function( selector, context ) {
 	// The deferred used on DOM ready
 	readyList,
 
+	// Promise methods
+	promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
+
 	// The ready event handler
 	DOMContentLoaded,
 
@@ -580,7 +579,7 @@ jQuery.extend({
 
 			script.type = "text/javascript";
 
-			if ( jQuery.support.scriptEval ) {
+			if ( jQuery.support.scriptEval() ) {
 				script.appendChild( document.createTextNode( data ) );
 			} else {
 				script.text = data;
@@ -898,9 +897,10 @@ jQuery.extend({
 	Deferred: function( func ) {
 
 		var deferred = jQuery._Deferred(),
-			failDeferred = jQuery._Deferred();
+			failDeferred = jQuery._Deferred(),
+			promise;
 
-		// Add errorDeferred methods and redefine cancel
+		// Add errorDeferred methods, then and promise
 		jQuery.extend( deferred , {
 
 			then: function( doneCallbacks , failCallbacks ) {
@@ -913,14 +913,18 @@ jQuery.extend({
 			isRejected: failDeferred.isResolved,
 			// Get a promise for this deferred
 			// If obj is provided, the promise aspect is added to the object
-			promise: function( obj ) {
-				obj = obj || {};
-				jQuery.each( "then done fail isResolved isRejected".split( " " ) , function( _ , method ) {
-					obj[ method ] = deferred[ method ];
-				});
-				obj.promise = function() {
-					return obj;
-				};
+			// (i is used internally)
+			promise: function( obj , i ) {
+				if ( obj == null ) {
+					if ( promise ) {
+						return promise;
+					}
+					promise = obj = {};
+				}
+				i = promiseMethods.length;
+				while( i-- ) {
+					obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ];
+				}
 				return obj;
 			}
 
@@ -942,10 +946,32 @@ jQuery.extend({
 
 	// Deferred helper
 	when: function( object ) {
-		object = object && jQuery.isFunction( object.promise ) ?
-			object :
-			jQuery.Deferred().resolve( object );
-		return object.promise();
+		var args = arguments,
+			length = args.length,
+			deferred = length <= 1 && object && jQuery.isFunction( object.promise ) ?
+				object :
+				jQuery.Deferred(),
+			promise = deferred.promise(),
+			resolveArray;
+
+		if ( length > 1 ) {
+			resolveArray = new Array( length );
+			jQuery.each( args, function( index, element, args ) {
+				jQuery.when( element ).done( function( value ) {
+					args = arguments;
+					resolveArray[ index ] = args.length > 1 ? slice.call( args , 0 ) : value;
+					if( ! --length ) {
+						deferred.fire( promise, resolveArray );
+					}
+				}).fail( function() {
+					deferred.fireReject( promise, arguments );
+				});
+				return !deferred.isRejected();
+			});
+		} else if ( deferred !== object ) {
+			deferred.resolve( object );
+		}
+		return promise;
 	},
 
 	// Use of jQuery.browser is frowned upon.
@@ -1009,9 +1035,8 @@ if ( indexOf ) {
 	};
 }
 
-// Verify that \s matches non-breaking spaces
-// (IE fails on this test)
-if ( !rwhite.test( "\xA0" ) ) {
+// IE doesn't match non-breaking spaces with \s
+if ( rnotwhite.test( "\xA0" ) ) {
 	trimLeft = /^[\s\xA0]+/;
 	trimRight = /[\s\xA0]+$/;
 }