Permalink
Browse files

Deferred: Fix $.when with resolved deferred and progress callbacks

Fixes gh-1894
Closes gh-1915
  • Loading branch information...
nicolashenry authored and markelog committed Dec 9, 2014
1 parent 5a0867d commit ab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1
Showing with 24 additions and 2 deletions.
  1. +2 −2 src/deferred.js
  2. +22 −0 test/unit/deferred.js
View
@@ -132,9 +132,9 @@ jQuery.extend({
for ( ; i < length; i++ ) {
if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
resolveValues[ i ].promise()
+ .progress( updateFunc( i, progressContexts, progressValues ) )
.done( updateFunc( i, resolveContexts, resolveValues ) )
- .fail( deferred.reject )
- .progress( updateFunc( i, progressContexts, progressValues ) );
+ .fail( deferred.reject );
} else {
--remaining;
}
View
@@ -436,3 +436,25 @@ test( "jQuery.when - joined", function() {
deferreds.futureSuccess.resolve( 1 );
deferreds.futureError.reject( 0 );
});
+
+test( "jQuery.when - resolved", function() {
+
+ expect( 6 );
+
+ var a = jQuery.Deferred().notify( 1 ).resolve( 4 ),
+ b = jQuery.Deferred().notify( 2 ).resolve( 5 ),
+ c = jQuery.Deferred().notify( 3 ).resolve( 6 );
+
+ jQuery.when( a, b, c ).progress(function( a, b, c ) {
+ strictEqual( a, 1, "first notify value ok" );
+ strictEqual( b, 2, "second notify value ok" );
+ strictEqual( c, 3, "third notify value ok" );
+ }).done(function( a, b, c ) {
+ strictEqual( a, 4, "first resolve value ok" );
+ strictEqual( b, 5, "second resolve value ok" );
+ strictEqual( c, 6, "third resolve value ok" );
+ }).fail(function() {
+ ok( false, "Error on resolve" );
+ });
+
+});

0 comments on commit ab20d9d

Please sign in to comment.