diff options
| author | Igor Minar | 2012-06-11 23:49:24 -0700 | 
|---|---|---|
| committer | Igor Minar | 2012-06-12 00:10:18 -0700 | 
| commit | f16150d5f1b20b3d633b4402095ea89baa4be042 (patch) | |
| tree | 9d5c570348264884174ecca52b958da7a821fcf8 /src/ng/timeout.js | |
| parent | fc0b2b5715655a05cbb4c8e79969c95d7e7ce8b7 (diff) | |
| download | angular.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/timeout.js')
| -rw-r--r-- | src/ng/timeout.js | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/src/ng/timeout.js b/src/ng/timeout.js index 5b51f85e..089b8110 100644 --- a/src/ng/timeout.js +++ b/src/ng/timeout.js @@ -9,26 +9,26 @@ function $TimeoutProvider() {       /**        * @ngdoc function -      * @name angular.module.ng.$timeout +      * @name ng.$timeout        * @requires $browser        *        * @description        * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch        * block and delegates any exceptions to -      * {@link angular.module.ng.$exceptionHandler $exceptionHandler} service. +      * {@link ng.$exceptionHandler $exceptionHandler} service.        *        * The return value of registering a timeout function is a promise which will be resolved when        * the timeout is reached and the timeout function is executed.        *        * To cancel a the timeout request, call `$timeout.cancel(promise)`.        * -      * In tests you can use {@link angular.module.ngMock.$timeout `$timeout.flush()`} to +      * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to        * synchronously flush the queue of deferred functions.        *        * @param {function()} fn A function, who's execution should be delayed.        * @param {number=} [delay=0] Delay in milliseconds.        * @param {boolean=} [invokeApply=true] If set to false skips model dirty checking, otherwise -      *   will invoke `fn` within the {@link angular.module.ng.$rootScope.Scope#$apply $apply} block. +      *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.        * @returns {*} Promise that will be resolved when the timeout is reached. The value this        *   promise will be resolved with is the return value of the `fn` function.        */ @@ -63,8 +63,8 @@ function $TimeoutProvider() {       /**        * @ngdoc function -      * @name angular.module.ng.$timeout#cancel -      * @methodOf angular.module.ng.$timeout +      * @name ng.$timeout#cancel +      * @methodOf ng.$timeout        *        * @description        * Cancels a task associated with the `promise`. As a result of this the promise will be | 
