From e7fdda981928befda72b78e9e2b17e33e232a603 Mon Sep 17 00:00:00 2001
From: nanto_vi <nanto@moon.email.ne.jp>
Date: Sun, 6 Jan 2013 17:09:28 +0900
Subject: [PATCH] Propagete context of returned deferred object in
 Deferred.then(). Fixes #13160

---
 src/deferred.js       |  6 ++++--
 test/unit/deferred.js | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/deferred.js b/src/deferred.js
index d84206570..4001c2384 100644
--- a/src/deferred.js
+++ b/src/deferred.js
@@ -35,7 +35,9 @@ jQuery.extend({
 										newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, [ returned ] );
 									}
 								} :
-								newDefer[ action ]
+								function() {
+									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, arguments );
+								}
 							);
 						});
 						fns = null;
@@ -72,7 +74,7 @@ jQuery.extend({
 
 			// deferred[ resolve | reject | notify ]
 			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( promise, arguments );
+				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
 				return this;
 			};
 			deferred[ tuple[0] + "With" ] = list.fireWith;
diff --git a/test/unit/deferred.js b/test/unit/deferred.js
index 86b0b3411..f9bc13a9c 100644
--- a/test/unit/deferred.js
+++ b/test/unit/deferred.js
@@ -273,7 +273,7 @@ test( "jQuery.Deferred.then - deferred (progress)", function() {
 
 test( "jQuery.Deferred.then - context", function() {
 
-	expect( 4 );
+	expect( 7 );
 
 	var context = {};
 
@@ -284,6 +284,12 @@ test( "jQuery.Deferred.then - context", function() {
 		strictEqual( value, 6, "proper value received" );
 	});
 
+	jQuery.Deferred().resolve().then(function() {
+		return jQuery.Deferred().resolveWith(context);
+	}).done(function() {
+		strictEqual( this, context, "custom context of returned deferred correctly propagated" );
+	});
+
 	var defer = jQuery.Deferred(),
 		piped = defer.then(function( value ) {
 			return value * 3;
@@ -295,6 +301,16 @@ test( "jQuery.Deferred.then - context", function() {
 		strictEqual( this, piped, "default context gets updated to latest promise in the chain" );
 		strictEqual( value, 6, "proper value received" );
 	});
+
+	var defer2 = jQuery.Deferred(),
+		piped2 = defer2.then();
+
+	defer2.resolve( 2 );
+
+	piped2.done(function( value ) {
+		strictEqual( this, piped2, "default context gets updated to latest promise in the chain (without passing function)" );
+		strictEqual( value, 2, "proper value received (without passing function)" );
+	});
 });
 
 test( "jQuery.when", function() {
-- 
2.39.5