aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/q.js
diff options
context:
space:
mode:
authorPeter Bacon Darwin2014-02-06 13:33:42 +0000
committerPeter Bacon Darwin2014-02-16 19:03:40 +0000
commit2e641ac49f121a6e2cc70bd3879930b44a8a7710 (patch)
tree11d52a598b7de52f7c31a1cc4405cba53f0a46ea /src/ng/q.js
parent1ca22a3dc8a469dc81718e5f0ae28225a2b7f7b2 (diff)
downloadangular.js-2e641ac49f121a6e2cc70bd3879930b44a8a7710.tar.bz2
docs(bike-shed-migration): convert doctype and names
Diffstat (limited to 'src/ng/q.js')
-rw-r--r--src/ng/q.js14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/ng/q.js b/src/ng/q.js
index d0807346..38a63f53 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -2,7 +2,7 @@
/**
* @ngdoc service
- * @name ng.$q
+ * @name $q
* @requires $rootScope
*
* @description
@@ -190,8 +190,7 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name ng.$q#defer
- * @methodOf ng.$q
+ * @name $q#defer
* @description
* Creates a `Deferred` object which represents a task which will finish in the future.
*
@@ -346,8 +345,7 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name ng.$q#reject
- * @methodOf ng.$q
+ * @name $q#reject
* @description
* Creates a promise that is resolved as rejected with the specified `reason`. This api should be
* used to forward rejection in a chain of promises. If you are dealing with the last promise in
@@ -405,8 +403,7 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name ng.$q#when
- * @methodOf ng.$q
+ * @name $q#when
* @description
* Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
* This is useful when you are dealing with an object that might or might not be a promise, or if
@@ -476,8 +473,7 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name ng.$q#all
- * @methodOf ng.$q
+ * @name $q#all
* @description
* Combines multiple promises into a single promise that is resolved when all of the input
* promises are resolved.