Permalink
Browse files

Deferred: .resolve(), .reject() and .notify() now set the callback co…

…ntext to the promise instance rather than the deferred instance ; .then() has also been amended. Fixes #11405.
  • Loading branch information...
jaubourg committed Dec 7, 2012
1 parent 282c044 commit 23d7cf0488bfeaab51d8f55435cab01f5cf990ca
Showing with 9 additions and 6 deletions.
  1. +6 −3 src/deferred.js
  2. +3 −3 test/unit/deferred.js
View
@@ -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;
});
View
@@ -292,7 +292,7 @@ test( "jQuery.Deferred.then - context", function() {
defer.resolve( 2 );
piped.done(function( value ) {
- strictEqual( this.promise(), piped, "default context gets updated to latest defer in the chain" );
+ strictEqual( this, piped, "default context gets updated to latest promise in the chain" );
strictEqual( value, 6, "proper value received" );
});
});
@@ -395,8 +395,8 @@ test( "jQuery.when - joined", function() {
expected = shouldResolve ? [ 1, 1 ] : [ 0, undefined ],
expectedNotify = shouldNotify && [ willNotify[ id1 ], willNotify[ id2 ] ],
code = id1 + "/" + id2,
- context1 = defer1 && jQuery.isFunction( defer1.promise ) ? defer1 : undefined,
- context2 = defer2 && jQuery.isFunction( defer2.promise ) ? defer2 : undefined;
+ context1 = defer1 && jQuery.isFunction( defer1.promise ) ? defer1.promise() : undefined,
+ context2 = defer2 && jQuery.isFunction( defer2.promise ) ? defer2.promise() : undefined;
jQuery.when( defer1, defer2 ).done(function( a, b ) {
if ( shouldResolve ) {

0 comments on commit 23d7cf0

Please sign in to comment.