aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/rootScope.js
diff options
context:
space:
mode:
authorMisko Hevery2012-02-28 12:14:47 -0800
committerMisko Hevery2012-06-02 16:02:07 -0700
commitdd38ce6585b0e7ffa755f4c65d78ed90204729d1 (patch)
treeb860430210467dadd768937818b6dc29d4ed06ba /src/ng/rootScope.js
parent2e90cdc3d4dff966faed97d3a566e9d9c00c9794 (diff)
downloadangular.js-dd38ce6585b0e7ffa755f4c65d78ed90204729d1.tar.bz2
docs(scope): rewrite
Diffstat (limited to 'src/ng/rootScope.js')
-rw-r--r--src/ng/rootScope.js22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 81c9ee78..449a30f6 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -56,7 +56,7 @@
*
* Every application has a single root {@link angular.module.ng.$rootScope.Scope scope}.
* All other scopes are child scopes of the root scope. Scopes provide mechanism for watching the model and provide
- * event processing life-cycle. See {@link guide/dev_guide.scopes developer guide on scopes}.
+ * event processing life-cycle. See {@link guide/scope developer guide on scopes}.
*/
function $RootScopeProvider(){
var TTL = 10;
@@ -119,9 +119,6 @@ function $RootScopeProvider(){
expect(parent.salutation).toEqual('Hello');
* </pre>
*
- * # Dependency Injection
- * See {@link guide/dev_guide.di dependency injection}.
- *
*
* @param {Object.<string, function()>=} providers Map of service factory which need to be provided
* for the current scope. Defaults to {@link angular.module.ng}.
@@ -273,12 +270,12 @@ function $RootScopeProvider(){
* {@link angular.module.ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers a
* call to the `listener`.
*
- * - `string`: Evaluated as {@link guide/dev_guide.expressions expression}
+ * - `string`: Evaluated as {@link guide/expression expression}
* - `function(scope)`: called with current `scope` as a parameter.
* @param {(function()|string)=} listener Callback called whenever the return value of
* the `watchExpression` changes.
*
- * - `string`: Evaluated as {@link guide/dev_guide.expressions expression}
+ * - `string`: Evaluated as {@link guide/expression expression}
* - `function(newValue, oldValue, scope)`: called with current and previous values as parameters.
*
* @param {boolean=} objectEquality Compare object for equality rather then for refference.
@@ -325,7 +322,7 @@ function $RootScopeProvider(){
* Because a {@link angular.module.ng.$rootScope.Scope#$watch watcher}'s listener can change the model, the
* `$digest()` keeps calling the {@link angular.module.ng.$rootScope.Scope#$watch watchers} until no more listeners are
* firing. This means that it is possible to get into an infinite loop. This function will throw
- * `'Maximum iteration limit exceeded.'` if the number of iterations exceeds 100.
+ * `'Maximum iteration limit exceeded.'` if the number of iterations exceeds 10.
*
* Usually you don't call `$digest()` directly in
* {@link angular.module.ng.$compileProvider.directive.ngController controllers} or in
@@ -503,9 +500,8 @@ function $RootScopeProvider(){
*
* @param {(string|function())=} expression An angular expression to be executed.
*
- * - `string`: execute using the rules as defined in {@link guide/dev_guide.expressions expression}.
- * - `function(scope, locals)`: execute the function with the current `scope` parameter.
- * @param {Object=} locals Hash object of local variables for the expression.
+ * - `string`: execute using the rules as defined in {@link guide/expression expression}.
+ * - `function(scope)`: execute the function with the current `scope` parameter.
*
* @returns {*} The result of evaluating the expression.
*/
@@ -533,7 +529,7 @@ function $RootScopeProvider(){
*
* @param {(string|function())=} expression An angular expression to be executed.
*
- * - `string`: execute using the rules as defined in {@link guide/dev_guide.expressions expression}.
+ * - `string`: execute using the rules as defined in {@link guide/expression expression}.
* - `function(scope)`: execute the function with the current `scope` parameter.
*
*/
@@ -570,7 +566,7 @@ function $RootScopeProvider(){
*
* Scope's `$apply()` method transitions through the following stages:
*
- * 1. The {@link guide/dev_guide.expressions expression} is executed using the
+ * 1. The {@link guide/expression expression} is executed using the
* {@link angular.module.ng.$rootScope.Scope#$eval $eval()} method.
* 2. Any exceptions from the execution of the expression are forwarded to the
* {@link angular.module.ng.$exceptionHandler $exceptionHandler} service.
@@ -580,7 +576,7 @@ function $RootScopeProvider(){
*
* @param {(string|function())=} exp An angular expression to be executed.
*
- * - `string`: execute using the rules as defined in {@link guide/dev_guide.expressions expression}.
+ * - `string`: execute using the rules as defined in {@link guide/expression expression}.
* - `function(scope)`: execute the function with current `scope` parameter.
*
* @returns {*} The result of evaluating the expression.