diff options
| author | Francesc Rosàs | 2013-04-15 18:27:36 +0300 |
|---|---|---|
| committer | Pete Bacon Darwin | 2013-04-16 13:38:11 +0100 |
| commit | 70e4fd286592d8f10dbe66960e71a00343be8a8b (patch) | |
| tree | 62f1d2ec668d6d523f9acbc3c5320525067140bc | |
| parent | 7898490779c2b2c359f1887c723ee260b3865639 (diff) | |
| download | angular.js-70e4fd286592d8f10dbe66960e71a00343be8a8b.tar.bz2 | |
docs($q): fix incorrect @returns tag for $q.when()
| -rw-r--r-- | src/ng/q.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ng/q.js b/src/ng/q.js index f3bd1d6e..5cda3a69 100644 --- a/src/ng/q.js +++ b/src/ng/q.js @@ -316,10 +316,7 @@ function qFactory(nextTick, exceptionHandler) { * the promise comes from a source that can't be trusted. * * @param {*} value Value or a promise - * @returns {Promise} Returns a single promise that will be resolved with an array of values, - * each value corresponding to the promise at the same index in the `promises` array. If any of - * the promises is resolved with a rejection, this resulting promise will be resolved with the - * same rejection. + * @returns {Promise} Returns a promise of the passed value or promise */ var when = function(value, callback, errback) { var result = defer(), |
