Deferred: .resolve(), .reject() and .notify() now set the callback context to the promise instance rather than the deferred instance ; .then() has also been amended. Fixes #11405.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/deferred.js b/src/deferred.js
index e525fc068..d84206570 100644
--- a/src/deferred.js
+++ b/src/deferred.js
@@ -32,7 +32,7 @@ jQuery.extend({
 											.fail( newDefer.reject )
 											.progress( newDefer.notify );
 									} else {
-										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
+										newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, [ returned ] );
 									}
 								} :
 								newDefer[ action ]
@@ -70,8 +70,11 @@ jQuery.extend({
 				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
 			}
 
-			// deferred[ resolve | reject | notify ] = list.fire
-			deferred[ tuple[0] ] = list.fire;
+			// deferred[ resolve | reject | notify ]
+			deferred[ tuple[0] ] = function() {
+				deferred[ tuple[0] + "With" ]( promise, arguments );
+				return this;
+			};
 			deferred[ tuple[0] + "With" ] = list.fireWith;
 		});