library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes gh-1894
Closes gh-1915
This commit is contained in:
Nicolas HENRY 2014-12-09 12:57:15 +00:00 committed by Oleg Gaidarenko
parent 5a0867d1e9
commit ab20d9d24f
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/deferred.js
View File

@ -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;
}

22
test/unit/deferred.js
View File

@ -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" );
});
});