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

Ref ab20d9d24f
This commit is contained in:
Nicolas HENRY
2014-12-09 12:57:15 +00:00
committed by Oleg Gaidarenko
parent 62a333e064
commit efb98f85ba
2 changed files with 24 additions and 2 deletions

View File

@@ -133,9 +133,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;
}