aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/q.js
diff options
context:
space:
mode:
authorIgor Minar2012-06-11 23:49:24 -0700
committerIgor Minar2012-06-12 00:10:18 -0700
commitf16150d5f1b20b3d633b4402095ea89baa4be042 (patch)
tree9d5c570348264884174ecca52b958da7a821fcf8 /src/ng/q.js
parentfc0b2b5715655a05cbb4c8e79969c95d7e7ce8b7 (diff)
downloadangular.js-f16150d5f1b20b3d633b4402095ea89baa4be042.tar.bz2
docs(*): simplify doc urls
we now have two types of namespaces: - true namespace: angular.* - used for all global apis - virtual namespace: ng.*, ngMock.*, ... - used for all DI modules the virual namespaces have services under the second namespace level (e.g. ng.) and filters and directives prefixed with filter: and directive: respectively (e.g. ng.filter:orderBy, ng.directive:ngRepeat) this simplifies urls and makes them a lot shorter while still avoiding name collisions
Diffstat (limited to 'src/ng/q.js')
-rw-r--r--src/ng/q.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ng/q.js b/src/ng/q.js
index b8e1166e..a79093e6 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -2,7 +2,7 @@
/**
* @ngdoc service
- * @name angular.module.ng.$q
+ * @name ng.$q
* @requires $rootScope
*
* @description
@@ -116,7 +116,7 @@
*
* There are three main differences:
*
- * - $q is integrated with the {@link angular.module.ng.$rootScope.Scope} Scope model observation
+ * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
* mechanism in angular, which means faster propagation of resolution or rejection into your
* models and avoiding unnecessary browser repaints, which would result in flickering UI.
* - $q promises are recognized by the templating engine in angular, which means that in templates
@@ -146,8 +146,8 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name angular.module.ng.$q#defer
- * @methodOf angular.module.ng.$q
+ * @name ng.$q#defer
+ * @methodOf ng.$q
* @description
* Creates a `Deferred` object which represents a task which will finish in the future.
*
@@ -236,8 +236,8 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name angular.module.ng.$q#reject
- * @methodOf angular.module.ng.$q
+ * @name ng.$q#reject
+ * @methodOf ng.$q
* @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
@@ -284,8 +284,8 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name angular.module.ng.$q#when
- * @methodOf angular.module.ng.$q
+ * @name ng.$q#when
+ * @methodOf ng.$q
* @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 on object that might or might not be a promise, or if
@@ -347,8 +347,8 @@ function qFactory(nextTick, exceptionHandler) {
/**
* @ngdoc
- * @name angular.module.ng.$q#all
- * @methodOf angular.module.ng.$q
+ * @name ng.$q#all
+ * @methodOf ng.$q
* @description
* Combines multiple promises into a single promise that is resolved when all of the input
* promises are resolved.