diff options
| author | Misko Hevery | 2012-03-23 13:31:20 -0700 |
|---|---|---|
| committer | Misko Hevery | 2012-03-23 14:21:43 -0700 |
| commit | ac75079e2113949d5d64adbcf23d56f3cf295d41 (patch) | |
| tree | 7956bcbd50de73755d599b624677666e20419595 /src | |
| parent | 5390fb37d2c01937922613fc57df4986af521787 (diff) | |
| download | angular.js-ac75079e2113949d5d64adbcf23d56f3cf295d41.tar.bz2 | |
fix(q): resolve all of nothing to nothing
$q.all([]) no longer throws exception and resolves to empty array []
Diffstat (limited to 'src')
| -rw-r--r-- | src/service/q.js | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/service/q.js b/src/service/q.js index f0c030b0..074acd1d 100644 --- a/src/service/q.js +++ b/src/service/q.js @@ -364,16 +364,20 @@ function qFactory(nextTick, exceptionHandler) { counter = promises.length, results = []; - forEach(promises, function(promise, index) { - promise.then(function(value) { - if (index in results) return; - results[index] = value; - if (!(--counter)) deferred.resolve(results); - }, function(reason) { - if (index in results) return; - deferred.reject(reason); + if (counter) { + forEach(promises, function(promise, index) { + ref(promise).then(function(value) { + if (index in results) return; + results[index] = value; + if (!(--counter)) deferred.resolve(results); + }, function(reason) { + if (index in results) return; + deferred.reject(reason); + }); }); - }); + } else { + deferred.resolve(results); + } return deferred.promise; } |
