From: nanto_vi <nanto@moon.email.ne.jp>
Date: Mon, 7 Jan 2013 16:02:40 +0000 (+0900)
Subject: Eliminate redundancy of Deferred.then().
X-Git-Tag: 2.0.0b1~18^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F1114%2Fhead;p=jquery.git

Eliminate redundancy of Deferred.then().
---

diff --git a/src/deferred.js b/src/deferred.js
index 4001c2384..0efc05dc3 100644
--- a/src/deferred.js
+++ b/src/deferred.js
@@ -21,24 +21,19 @@ jQuery.extend({
 					return jQuery.Deferred(function( newDefer ) {
 						jQuery.each( tuples, function( i, tuple ) {
 							var action = tuple[ 0 ],
-								fn = fns[ i ];
+								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
 							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ]( jQuery.isFunction( fn ) ?
-								function() {
-									var returned = fn.apply( this, arguments );
-									if ( returned && jQuery.isFunction( returned.promise ) ) {
-										returned.promise()
-											.done( newDefer.resolve )
-											.fail( newDefer.reject )
-											.progress( newDefer.notify );
-									} else {
-										newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, [ returned ] );
-									}
-								} :
-								function() {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, arguments );
+							deferred[ tuple[1] ](function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise()
+										.done( newDefer.resolve )
+										.fail( newDefer.reject )
+										.progress( newDefer.notify );
+								} else {
+									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
 								}
-							);
+							});
 						});
 						fns = null;
 					}).promise();