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:48:57 +0300 |
| commit | efb98f85bab7f2ec9f38d6991d7b1bc683a514ce (patch) | |
| tree | 96c9bf8e050e05397cf1a58ed3bcc5b082595473 /src/deferred.js | |
| parent | 62a333e0646d3011377ed13a6fcfbb08e91e2bef (diff) | |
| download | jquery-efb98f85bab7f2ec9f38d6991d7b1bc683a514ce.tar.gz jquery-efb98f85bab7f2ec9f38d6991d7b1bc683a514ce.zip | |
Deferred: Fix $.when with resolved deferred and progress callbacks
Ref ab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1
Diffstat (limited to 'src/deferred.js')
| -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 04cb77197..5d58ed2cf 100644 --- a/src/deferred.js +++ b/src/deferred.js @@ -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; } |