Change to 'then' for common promise object

arronzhang · Dec 14, 2011 · 62037c8 · 62037c8
1 parent 92c1892
commit 62037c8
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -134,7 +134,7 @@ function and ( firstParam ) {
 	} 
 
 	var dfd = jQuery.Deferred();
-	this.done( function() {
+	this.then( function() {
 		var last = slice.call( arguments )
 			, res;
 		try {
@@ -146,17 +146,17 @@ function and ( firstParam ) {
 			dfd.reject( res );
 		} else {
 			res = isFunction( res && res.promise ) ? res : jQuery.when( res );
-			res.done( function( value ) {
+			res.then( function( value ) {
 				var args = [ arguments.length > 1 ? slice.call( arguments, 0 ) : value ]
 					, i = last.length;
 				while( i ) {
 					args.unshift( last[ --i ] );
 				}
 				dfd.resolve.apply( dfd, args );
-			} ).fail( dfd.reject );
+			}, dfd.reject );
 		}
 
-	} ).fail( dfd.reject );
+	}, dfd.reject );
 
 	var promise = dfd.promise();
 	promise.and = and;
@@ -210,7 +210,7 @@ function and ( firstParam ) {
 	} 
 
 	var dfd = jQuery.Deferred();
-	this.done( function() {
+	this.then( function() {
 		var last = slice.call( arguments )
 			, res;
 		try {
@@ -222,13 +222,13 @@ function and ( firstParam ) {
 			dfd.reject( res );
 		} else {
 			res = isFunction( res && res.promise ) ? res : jQuery.when( res );
-			res.done( function( value ) {
+			res.then( function( value ) {
 				var args = [ arguments.length > 1 ? slice.call( arguments, 0 ) : value ];
 				dfd.resolve.apply( dfd, args );
-			} ).fail( dfd.reject );
+			}, dfd.reject );
 		}
 
-	} ).fail( dfd.reject );
+	}, dfd.reject );
 
 	var promise = dfd.promise();
 	promise.next = next;