diff options
| author | Nicolas HENRY <icewil@gmail.com> | 2014-12-09 12:57:15 +0000 |
|---|---|---|
| committer | Oleg Gaidarenko <markelog@gmail.com> | 2014-12-25 15:39:28 +0300 |
| commit | ab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1 (patch) | |
| tree | d847a370e87e34235163537d5d5683e87fb999fd /src | |
| parent | 5a0867d1e94794fbfc3be1f18f4c0a168dc18d95 (diff) | |
| download | jquery-ab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1.tar.gz jquery-ab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1.zip | |
Deferred: Fix $.when with resolved deferred and progress callbacks
Fixes gh-1894
Closes gh-1915
Diffstat (limited to 'src')
| -rw-r--r-- | src/deferred.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/deferred.js b/src/deferred.js index 5f6e0a2fa..939b58f37 100644 --- a/src/deferred.js +++ b/src/deferred.js @@ -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; } |