- ![Link to Angular JS Homepage]()
+ ![Link to AngularJS Homepage]()
-
@@ -217,7 +217,7 @@
{{ key }}
Super-powered by Google ©2010-2017 ( + ng-bind-template="v{{version}}" title="Changelog of this version of AngularJS"> )diff --git a/docs/content/api/index.ngdoc b/docs/content/api/index.ngdoc index f824f6a4ef73..8b954a86bd05 100644 --- a/docs/content/api/index.ngdoc +++ b/docs/content/api/index.ngdoc @@ -11,14 +11,14 @@ These components are {@link guide/directive directives}, {@link guide/services s There is also a {@link guide/index guide} with articles on various topics, and a list of external resources.
-**Angular Prefixes `$` and `$$`**:
+**AngularJS Prefixes `$` and `$$`**:
To prevent accidental name collisions with your code,
-Angular prefixes names of public objects with `$` and names of private objects with `$$`.
+AngularJS prefixes names of public objects with `$` and names of private objects with `$$`.
Please do not use the `$` or `$$` prefix in your code.
-## Angular Modules
+## AngularJS Modules
## {@link ng ng (core module)}
@@ -83,7 +83,7 @@ This module is provided by default and contains the core components of AngularJS
- The core global API functions are attached to the angular object. These core functions are useful for low level JavaScript operations within your application. + The core global API functions are attached to the `angular` object. These core functions are useful for low level JavaScript operations within your application.
Some examples include: @@ -130,7 +130,7 @@ Use ngRoute to enable URL routing to your application. The ngRoute module suppor ## {@link ngAnimate ngAnimate} -Use ngAnimate to enable animation features within your application. Various core ng directives will provide +Use ngAnimate to enable animation features within your application. Various core AngularJS directives will provide animation hooks into your application when ngAnimate is included. Animations are defined by using CSS transitions/animations or JavaScript callbacks. diff --git a/docs/content/error/$animate/nocb.ngdoc b/docs/content/error/$animate/nocb.ngdoc index ac5bd360602d..e0e2e95e0304 100644 --- a/docs/content/error/$animate/nocb.ngdoc +++ b/docs/content/error/$animate/nocb.ngdoc @@ -3,7 +3,7 @@ @fullName Do not pass a callback to animate methods @description -Since Angular 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter. +Since AngularJS 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter. Instead, they return a promise to which you can attach `then` handlers to be run when the animation completes. If you are getting this error then you need to update your code to use the promise-based API. diff --git a/docs/content/error/$compile/infchng.ngdoc b/docs/content/error/$compile/infchng.ngdoc index 00d97061fe45..463840ee933e 100644 --- a/docs/content/error/$compile/infchng.ngdoc +++ b/docs/content/error/$compile/infchng.ngdoc @@ -5,7 +5,7 @@ This error occurs when the application's model becomes unstable because some `$onChanges` hooks are causing updates which then trigger further calls to `$onChanges` that can never complete. -Angular detects this situation and prevents an infinite loop from causing the browser to become unresponsive. +AngularJS detects this situation and prevents an infinite loop from causing the browser to become unresponsive. For example, the situation can occur by setting up a `$onChanges()` hook which triggers an event on the component, which subsequently triggers the component's bound inputs to be updated: diff --git a/docs/content/error/$http/badjsonp.ngdoc b/docs/content/error/$http/badjsonp.ngdoc index 18201550bb52..ab42b46c7fdf 100644 --- a/docs/content/error/$http/badjsonp.ngdoc +++ b/docs/content/error/$http/badjsonp.ngdoc @@ -11,7 +11,7 @@ value is `JSON_CALLBACK`. parameter is specified in the configuration object (or in the defaults) via the `jsonpCallbackParam` property. You must not provide your own parameter with this name in the configuratio of the request. -In previous versions of Angular, you specified where to add the callback parameter value via the +In previous versions of AngularJS, you specified where to add the callback parameter value via the `JSON_CALLBACK` placeholder. This is no longer allowed. To resolve this error, remove any parameters that have the same name as the `jsonpCallbackParam`; diff --git a/docs/content/error/$injector/modulerr.ngdoc b/docs/content/error/$injector/modulerr.ngdoc index 4746bf66209f..aae351078435 100644 --- a/docs/content/error/$injector/modulerr.ngdoc +++ b/docs/content/error/$injector/modulerr.ngdoc @@ -15,7 +15,7 @@ In AngularJS `1.2.0` and later, `ngRoute` has been moved to its own module. If you are getting this error after upgrading to `1.2.x` or later, be sure that you've installed {@link ngRoute `ngRoute`}. -### Monkey-patching Angular's `ng` module +### Monkey-patching AngularJS's `ng` module This error can also occur if you have tried to add your own components to the `ng` module. This has never been supported and from `1.3.0` it will actually trigger this error. diff --git a/docs/content/error/$interpolate/badexpr.ngdoc b/docs/content/error/$interpolate/badexpr.ngdoc index 346907c21be2..8ef977231fd5 100644 --- a/docs/content/error/$interpolate/badexpr.ngdoc +++ b/docs/content/error/$interpolate/badexpr.ngdoc @@ -3,4 +3,4 @@ @fullName Expecting end operator @description -The Angular expression is missing the corresponding closing operator. +The AngularJS expression is missing the corresponding closing operator. diff --git a/docs/content/error/$interpolate/dupvalue.ngdoc b/docs/content/error/$interpolate/dupvalue.ngdoc index 3d72f28e1210..c9cd39014a3a 100644 --- a/docs/content/error/$interpolate/dupvalue.ngdoc +++ b/docs/content/error/$interpolate/dupvalue.ngdoc @@ -8,4 +8,4 @@ extension in your interpolation expression. The different choices have to be un For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/logicbug.ngdoc b/docs/content/error/$interpolate/logicbug.ngdoc index c660d8d39706..9753424d9942 100644 --- a/docs/content/error/$interpolate/logicbug.ngdoc +++ b/docs/content/error/$interpolate/logicbug.ngdoc @@ -9,4 +9,4 @@ bug mentioning the exact version of AngularJS used and we will fix it! For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/nochgmustache.ngdoc b/docs/content/error/$interpolate/nochgmustache.ngdoc index 01652dafef02..af7981992086 100644 --- a/docs/content/error/$interpolate/nochgmustache.ngdoc +++ b/docs/content/error/$interpolate/nochgmustache.ngdoc @@ -14,4 +14,4 @@ future commit and the github issue will help gauge urgency. For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/reqarg.ngdoc b/docs/content/error/$interpolate/reqarg.ngdoc index ee6ff2c8ca92..89f27fdc4c0d 100644 --- a/docs/content/error/$interpolate/reqarg.ngdoc +++ b/docs/content/error/$interpolate/reqarg.ngdoc @@ -4,9 +4,9 @@ @description You must specify the MessageFormat function that you're using right after the -comma following the Angular expression. Currently, the supported functions are +comma following the AngularJS expression. Currently, the supported functions are "plural" and "select" (for gender selections.) For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/reqcomma.ngdoc b/docs/content/error/$interpolate/reqcomma.ngdoc index 13b137ecc5cd..fccfe95c4ed7 100644 --- a/docs/content/error/$interpolate/reqcomma.ngdoc +++ b/docs/content/error/$interpolate/reqcomma.ngdoc @@ -8,4 +8,4 @@ extension keyword in the extended interpolation syntax. For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/reqendbrace.ngdoc b/docs/content/error/$interpolate/reqendbrace.ngdoc index a3e765dd698b..b7d75ce19797 100644 --- a/docs/content/error/$interpolate/reqendbrace.ngdoc +++ b/docs/content/error/$interpolate/reqendbrace.ngdoc @@ -8,4 +8,4 @@ brace to mark the end of the message. For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/reqopenbrace.ngdoc b/docs/content/error/$interpolate/reqopenbrace.ngdoc index 6ea091702044..3e0041e9912b 100644 --- a/docs/content/error/$interpolate/reqopenbrace.ngdoc +++ b/docs/content/error/$interpolate/reqopenbrace.ngdoc @@ -9,4 +9,4 @@ braces. For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/reqother.ngdoc b/docs/content/error/$interpolate/reqother.ngdoc index 3ed329f893a7..cdfeb5f03d1c 100644 --- a/docs/content/error/$interpolate/reqother.ngdoc +++ b/docs/content/error/$interpolate/reqother.ngdoc @@ -10,4 +10,4 @@ extensions require that you provide a message for the selection "other". For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/unknarg.ngdoc b/docs/content/error/$interpolate/unknarg.ngdoc index 313fec6b32db..779594141181 100644 --- a/docs/content/error/$interpolate/unknarg.ngdoc +++ b/docs/content/error/$interpolate/unknarg.ngdoc @@ -9,4 +9,4 @@ unsupported or invalid. For more information about the MessageFormat syntax in interpolation expressions, please refer to MessageFormat extensions section at -{@link guide/i18n#MessageFormat Angular i18n MessageFormat} +{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat} diff --git a/docs/content/error/$interpolate/unsafe.ngdoc b/docs/content/error/$interpolate/unsafe.ngdoc index bec99dc6a743..91cc7d915d20 100644 --- a/docs/content/error/$interpolate/unsafe.ngdoc +++ b/docs/content/error/$interpolate/unsafe.ngdoc @@ -7,4 +7,4 @@ You have attempted to use a MessageFormat extension in your interpolation expres Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping (SCE)} and about the MessageFormat extensions at {@link -guide/i18n#MessageFormat Angular i18n MessageFormat}. +guide/i18n#MessageFormat AngularJS i18n MessageFormat}. diff --git a/docs/content/error/$interpolate/untermstr.ngdoc b/docs/content/error/$interpolate/untermstr.ngdoc index 4800f46276af..c3575e1cc05d 100644 --- a/docs/content/error/$interpolate/untermstr.ngdoc +++ b/docs/content/error/$interpolate/untermstr.ngdoc @@ -3,4 +3,4 @@ @fullName Unterminated string literal @description -The string literal was not terminated in your Angular expression. +The string literal was not terminated in your AngularJS expression. diff --git a/docs/content/error/$location/nobase.ngdoc b/docs/content/error/$location/nobase.ngdoc index a92f50d23f6f..baa14dc090d8 100644 --- a/docs/content/error/$location/nobase.ngdoc +++ b/docs/content/error/$location/nobase.ngdoc @@ -40,7 +40,7 @@ URL of the subcontext: ``` -Before Angular 1.3 we didn't have this hard requirement and it was easy to write apps that worked +Before AngularJS 1.3 we didn't have this hard requirement and it was easy to write apps that worked when deployed in the root context but were broken when moved to a sub-context because in the sub-context all absolute urls would resolve to the root context of the app. To prevent this, use relative URLs throughout your app: diff --git a/docs/content/error/$parse/lexerr.ngdoc b/docs/content/error/$parse/lexerr.ngdoc index 2a40d9399fb0..b5a95d829a5f 100644 --- a/docs/content/error/$parse/lexerr.ngdoc +++ b/docs/content/error/$parse/lexerr.ngdoc @@ -7,4 +7,4 @@ Occurs when an expression has a lexical error, for example a malformed number (0 The error message contains a more precise error. -To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax. +To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax. diff --git a/docs/content/error/$parse/syntax.ngdoc b/docs/content/error/$parse/syntax.ngdoc index 1af212f18288..33d6bc0d317c 100644 --- a/docs/content/error/$parse/syntax.ngdoc +++ b/docs/content/error/$parse/syntax.ngdoc @@ -6,4 +6,4 @@ Occurs when there is a syntax error in an expression. These errors are thrown while compiling the expression. The error message contains a more precise description of the error, including the location (column) in the expression where the error occurred. -To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax. +To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax. diff --git a/docs/content/error/$parse/ueoe.ngdoc b/docs/content/error/$parse/ueoe.ngdoc index e96df0322377..6fca05b4cce8 100644 --- a/docs/content/error/$parse/ueoe.ngdoc +++ b/docs/content/error/$parse/ueoe.ngdoc @@ -8,5 +8,5 @@ Occurs when an expression is missing tokens at the end of the expression. For example, forgetting to close a bracket or failing to properly escape quotes in an expression will trigger this error. -To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and +To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax. diff --git a/docs/content/error/$rootScope/infdig.ngdoc b/docs/content/error/$rootScope/infdig.ngdoc index a0922742c153..7eae81ec7197 100644 --- a/docs/content/error/$rootScope/infdig.ngdoc +++ b/docs/content/error/$rootScope/infdig.ngdoc @@ -4,7 +4,7 @@ @description This error occurs when the application's model becomes unstable and each `$digest` cycle triggers a state change and subsequent `$digest` cycle. -Angular detects this situation and prevents an infinite loop from causing the browser to become unresponsive. +AngularJS detects this situation and prevents an infinite loop from causing the browser to become unresponsive. For example, the situation can occur by setting up a watch on a path and subsequently updating the same path when the value changes. @@ -26,7 +26,7 @@ $scope.getUsers = function() { }; ``` -Since `getUsers()` returns a new array, Angular determines that the model is different on each `$digest` +Since `getUsers()` returns a new array, AngularJS determines that the model is different on each `$digest` cycle, resulting in the error. The solution is to return the same array object if the elements have not changed: diff --git a/docs/content/error/$rootScope/inprog.ngdoc b/docs/content/error/$rootScope/inprog.ngdoc index fab262072880..6a4549c0e001 100644 --- a/docs/content/error/$rootScope/inprog.ngdoc +++ b/docs/content/error/$rootScope/inprog.ngdoc @@ -10,17 +10,17 @@ the error. ## Background -Angular uses a dirty-checking digest mechanism to monitor and update values of the scope during +AngularJS uses a dirty-checking digest mechanism to monitor and update values of the scope during the processing of your application. The digest works by checking all the values that are being watched against their previous value and running any watch handlers that have been defined for those values that have changed. This digest mechanism is triggered by calling `$digest` on a scope object. Normally you do not need to trigger a digest manually, because every external action that can trigger changes in your -application, such as mouse events, timeouts or server responses, wrap the Angular application code +application, such as mouse events, timeouts or server responses, wrap the AngularJS application code in a block of code that will run `$digest` when the code completes. -You wrap Angular code in a block that will be followed by a `$digest` by calling `$apply` on a scope +You wrap AngularJS code in a block that will be followed by a `$digest` by calling `$apply` on a scope object. So, in pseudo-code, the process looks like this: ``` @@ -45,20 +45,20 @@ $apply = function(fn) { ## Digest Phases -Angular keeps track of what phase of processing we are in, the relevant ones being `$apply` and +AngularJS keeps track of what phase of processing we are in, the relevant ones being `$apply` and `$digest`. Trying to reenter a `$digest` or `$apply` while one of them is already in progress is -typically a sign of programming error that needs to be fixed. So Angular will throw this error when +typically a sign of programming error that needs to be fixed. So AngularJS will throw this error when that occurs. In most situations it should be well defined whether a piece of code will be run inside an `$apply`, in which case you should not be calling `$apply` or `$digest`, or it will be run outside, in which -case you should wrap any code that will be interacting with Angular scope or services, in a call to +case you should wrap any code that will be interacting with AngularJS scope or services, in a call to `$apply`. -As an example, all Controller code should expect to be run within Angular, so it should have no need +As an example, all Controller code should expect to be run within AngularJS, so it should have no need to call `$apply` or `$digest`. Conversely, code that is being trigger directly as a call back to some external event, from the DOM or 3rd party library, should expect that it is never called from -within Angular, and so any Angular application code that it calls should first be wrapped in a call +within AngularJS, and so any AngularJS application code that it calls should first be wrapped in a call to $apply. ## Common Causes @@ -84,8 +84,8 @@ function MyController($scope, thirdPartyComponent) { } ``` -We expect that our callback will be called asynchronously, and so from outside Angular. Therefore, we -correctly wrap our application code that interacts with Angular in a call to `$apply`. +We expect that our callback will be called asynchronously, and so from outside AngularJS. Therefore, we +correctly wrap our application code that interacts with AngularJS in a call to `$apply`. The problem comes if `getData()` decides to call the callback handler synchronously; perhaps it has the data already cached in memory and so it immediately calls the callback to return the data, @@ -116,7 +116,7 @@ that the code will be called in a single `$apply` block. ### Triggering Events Programmatically The other situation that often leads to this error is when you trigger code (such as a DOM event) -programmatically (from within Angular), which is normally called by an external trigger. +programmatically (from within AngularJS), which is normally called by an external trigger. For example, consider a directive that will set focus on an input control when a value in the scope is true: @@ -161,7 +161,7 @@ In this second scenario, we are already inside a `$digest` when the ngFocus dire call to `$apply()`, causing this error to be thrown. It is possible to workaround this problem by moving the call to set the focus outside of the digest, -by using `$timeout(fn, 0, false)`, where the `false` value tells Angular not to wrap this `fn` in an +by using `$timeout(fn, 0, false)`, where the `false` value tells AngularJS not to wrap this `fn` in an `$apply` block: ``` @@ -203,7 +203,7 @@ Once you have identified this call you work your way up the stack to see what th called from within an `$apply`/`$digest`. It may be a simple oversight or maybe it fits with the sync/async scenario described earlier. -* If the second call was made inside an Angular directive then it is likely that it matches the second +* If the second call was made inside an AngularJS directive then it is likely that it matches the second programmatic event trigger scenario described earlier. In this case you may need to look further up the tree to what triggered the event in the first place. @@ -259,11 +259,11 @@ $get.g.$apply angular.js:12742 <--- $apply q angular.js:320 ``` -We can see (even though the Angular code is minified) that there were two calls to `$apply`, first +We can see (even though the AngularJS code is minified) that there were two calls to `$apply`, first on line `19833`, then on line `12738` of `angular.js`. It is this second call that caused the error. If we look at the angular.js code, we can see that -this call is made by an Angular directive. +this call is made by an AngularJS directive. ``` var ngEventDirectives = {}; @@ -308,5 +308,5 @@ We can now see that the second `$apply` was caused by us programmatically trigge `$timeout` as described above. ## Further Reading -To learn more about Angular processing model please check out the +To learn more about AngularJS processing model please check out the {@link guide/concepts concepts doc} as well as the {@link ng.$rootScope.Scope api} doc. diff --git a/docs/content/error/$sanitize/noinert.ngdoc b/docs/content/error/$sanitize/noinert.ngdoc index 0562016bede1..3eb5944eb3c5 100644 --- a/docs/content/error/$sanitize/noinert.ngdoc +++ b/docs/content/error/$sanitize/noinert.ngdoc @@ -7,4 +7,4 @@ This error occurs when `$sanitize` sanitizer determines that `document.implement This api is necessary for safe parsing of HTML strings into DOM trees and without it the sanitizer can't sanitize the input. -The api is present in all supported browsers including IE 9.0, so the presence of this error usually indicates that Angular's `$sanitize` is being used on an unsupported platform. +The api is present in all supported browsers including IE 9.0, so the presence of this error usually indicates that AngularJS's `$sanitize` is being used on an unsupported platform. diff --git a/docs/content/error/$sce/insecurl.ngdoc b/docs/content/error/$sce/insecurl.ngdoc index acd1248dfea9..fde7e22fb7c2 100644 --- a/docs/content/error/$sce/insecurl.ngdoc +++ b/docs/content/error/$sce/insecurl.ngdoc @@ -5,10 +5,10 @@ AngularJS' {@link ng.$sce Strict Contextual Escaping (SCE)} mode (enabled by default) has blocked loading a resource from an insecure URL. -Typically, this would occur if you're attempting to load an Angular template from an untrusted source. +Typically, this would occur if you're attempting to load an AngularJS template from an untrusted source. It's also possible that a custom directive threw this error for a similar reason. -Angular only loads templates from trusted URLs (by calling {@link ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl} on the template URL). +AngularJS only loads templates from trusted URLs (by calling {@link ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl} on the template URL). By default, only URLs that belong to the same origin are trusted. These are urls with the same domain, protocol and port as the application document. diff --git a/docs/content/error/$sce/unsafe.ngdoc b/docs/content/error/$sce/unsafe.ngdoc index 0f24bf7bf4c8..5b6420a1581f 100644 --- a/docs/content/error/$sce/unsafe.ngdoc +++ b/docs/content/error/$sce/unsafe.ngdoc @@ -5,10 +5,10 @@ The value provided for use in a specific context was not found to be safe/trusted for use. -Angular's {@link ng.$sce Strict Contextual Escaping (SCE)} mode +AngularJS's {@link ng.$sce Strict Contextual Escaping (SCE)} mode (enabled by default), requires bindings in certain contexts to result in a value that is trusted as safe for use in such a context. (e.g. loading an -Angular template from a URL requires that the URL is one considered safe for loading resources.) +AngularJS template from a URL requires that the URL is one considered safe for loading resources.) This helps prevent XSS and other security issues. Read more at {@link ng.$sce Strict Contextual Escaping (SCE)} diff --git a/docs/content/error/jqLite/nosel.ngdoc b/docs/content/error/jqLite/nosel.ngdoc index a70e05bbf47e..fa0a1cf7dbdb 100644 --- a/docs/content/error/jqLite/nosel.ngdoc +++ b/docs/content/error/jqLite/nosel.ngdoc @@ -3,9 +3,9 @@ @fullName Unsupported Selector Lookup @description -In order to keep Angular small, Angular implements only a subset of the selectors in {@link angular.element#angular-s-jqlite jqLite}. +In order to keep AngularJS small, AngularJS implements only a subset of the selectors in {@link angular.element#angular-s-jqlite jqLite}. This error occurs when a jqLite instance is invoked with a selector other than this subset. In order to resolve this error, rewrite your code to only use tag name selectors and manually traverse the DOM using the APIs provided by jqLite. -Alternatively, you can include a full version of jQuery, which Angular will automatically use and that will make all selectors available. +Alternatively, you can include a full version of jQuery, which AngularJS will automatically use and that will make all selectors available. diff --git a/docs/content/error/ng/test.ngdoc b/docs/content/error/ng/test.ngdoc index 42f83ae67977..7088f5c8ee43 100644 --- a/docs/content/error/ng/test.ngdoc +++ b/docs/content/error/ng/test.ngdoc @@ -3,7 +3,7 @@ @fullName Testability Not Found @description -Angular's testability helper, getTestability, requires a root element to be -passed in. This helps differentiate between different Angular apps on the same +AngularJS's testability helper, getTestability, requires a root element to be +passed in. This helps differentiate between different AngularJS apps on the same page. This error is thrown when no injector is found for root element. It is often because the root element is outside of the ng-app. diff --git a/docs/content/error/ngModel/datefmt.ngdoc b/docs/content/error/ngModel/datefmt.ngdoc index 57c2fce1d649..0e174251ad08 100644 --- a/docs/content/error/ngModel/datefmt.ngdoc +++ b/docs/content/error/ngModel/datefmt.ngdoc @@ -5,7 +5,7 @@ All date-related inputs like `` require the model to be a `Date` object. If the model is something else, this error will be thrown. -Angular does not set validation errors on the `` in this case +AngularJS does not set validation errors on the `` in this case as those errors are shown to the user, but the erroneous state was caused by incorrect application logic and not by the user. diff --git a/docs/content/error/ngModel/numfmt.ngdoc b/docs/content/error/ngModel/numfmt.ngdoc index 7d32fc595b3c..5eee0c34337c 100644 --- a/docs/content/error/ngModel/numfmt.ngdoc +++ b/docs/content/error/ngModel/numfmt.ngdoc @@ -7,7 +7,7 @@ The `input[number]` and `input[range]` directives require the model to be a `num If the model is something else, this error will be thrown. -Angular does not set validation errors on the `` in this case +AngularJS does not set validation errors on the `` in this case as this error is caused by incorrect application logic and not by bad input from the user. If your model does not contain actual numbers then it is up to the application developer diff --git a/docs/content/guide/$location.ngdoc b/docs/content/guide/$location.ngdoc index a857d1de3530..bff9722f6ee5 100644 --- a/docs/content/guide/$location.ngdoc +++ b/docs/content/guide/$location.ngdoc @@ -48,7 +48,7 @@ changes to `$location` are reflected into the browser address bar.
-This looks like normal HTML, with some new markup. In Angular, a file like this is called a
-{@link templates template}. When Angular starts your application, it parses and
+This looks like normal HTML, with some new markup. In AngularJS, a file like this is called a
+{@link templates template}. When AngularJS starts your application, it parses and
processes this new markup from the template using the {@link compiler compiler}.
The loaded, transformed and rendered DOM is then called the *view*.
The first kind of new markup are the {@link directive directives}.
They apply special behavior to attributes or elements in the HTML. In the example above we use the
{@link ng.directive:ngApp `ng-app`} attribute, which is linked to a directive that automatically
-initializes our application. Angular also defines a directive for the {@link ng.directive:input `input`}
+initializes our application. AngularJS also defines a directive for the {@link ng.directive:input `input`}
element that adds extra behavior to the element. The {@link ng.directive:ngModel `ng-model`} directive
stores/updates the value of the input field into/from a variable.
-**Custom directives to access the DOM**: In Angular, the only place where an application should access the DOM is
+**Custom directives to access the DOM**: In AngularJS, the only place where an application should access the DOM is
within directives. This is important because artifacts that access the DOM are hard to test.
If you need to access the DOM directly you should write a custom directive for this. The
{@link directive directives guide} explains how to do this.
@@ -76,12 +76,12 @@ stores/updates the value of the input field into/from a variable.
The second kind of new markup are the double curly braces `{{ expression | filter }}`:
When the compiler encounters this markup, it will replace it with the evaluated value of the markup.
An {@link expression expression} in a template is a JavaScript-like code snippet that allows
-Angular to read and write variables. Note that those variables are not global variables.
+AngularJS to read and write variables. Note that those variables are not global variables.
Just like variables in a JavaScript function live in a scope,
-Angular provides a {@link scope scope} for the variables accessible to expressions.
+AngularJS provides a {@link scope scope} for the variables accessible to expressions.
The values that are stored in variables on the scope are referred to as the *model*
in the rest of the documentation.
-Applied to the example above, the markup directs Angular to "take the data we got from the input widgets
+Applied to the example above, the markup directs AngularJS to "take the data we got from the input widgets
and multiply them together".
The example above also contains a {@link guide/filter filter}.
@@ -89,7 +89,7 @@ A filter formats the value of an expression for display to the user.
In the example above, the filter {@link ng.filter:currency `currency`} formats a number
into an output that looks like money.
-The important thing in the example is that Angular provides _live_ bindings:
+The important thing in the example is that AngularJS provides _live_ bindings:
Whenever the input values change, the value of the expressions are automatically
recalculated and the DOM is updated with their values.
The concept behind this is {@link databinding two-way data binding}.
@@ -157,9 +157,9 @@ expressions and directives.
Besides the new file that contains the controller code, we also added an
{@link ng.directive:ngController `ng-controller`} directive to the HTML.
-This directive tells Angular that the new `InvoiceController` is responsible for the element with the directive
+This directive tells AngularJS that the new `InvoiceController` is responsible for the element with the directive
and all of the element's children.
-The syntax `InvoiceController as invoice` tells Angular to instantiate the controller
+The syntax `InvoiceController as invoice` tells AngularJS to instantiate the controller
and save it in the variable `invoice` in the current scope.
We also changed all expressions in the page to read and write variables within that
@@ -260,22 +260,22 @@ get a hold of the now separated function?
This is where {@link di Dependency Injection} comes into play.
Dependency Injection (DI) is a software design pattern that
deals with how objects and functions get created and how they get a hold of their dependencies.
-Everything within Angular (directives, filters, controllers,
-services, ...) is created and wired using dependency injection. Within Angular,
+Everything within AngularJS (directives, filters, controllers,
+services, ...) is created and wired using dependency injection. Within AngularJS,
the DI container is called the {@link di injector}.
To use DI, there needs to be a place where all the things that should work together are registered.
-In Angular, this is the purpose of the {@link module modules}.
-When Angular starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
+In AngularJS, this is the purpose of the {@link module modules}.
+When AngularJS starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
including the configuration of all modules that this module depends on.
In the example above:
-The template contains the directive `ng-app="invoice2"`. This tells Angular
+The template contains the directive `ng-app="invoice2"`. This tells AngularJS
to use the `invoice2` module as the main module for the application.
The code snippet `angular.module('invoice2', ['finance2'])` specifies that the `invoice2` module depends on the
-`finance2` module. By this, Angular uses the `InvoiceController` as well as the `currencyConverter` service.
+`finance2` module. By this, AngularJS uses the `InvoiceController` as well as the `currencyConverter` service.
-Now that Angular knows of all the parts of the application, it needs to create them.
+Now that AngularJS knows of all the parts of the application, it needs to create them.
In the previous section we saw that controllers are created using a constructor function.
For services, there are multiple ways to specify how they are created
(see the {@link services service guide}).
@@ -284,24 +284,24 @@ In the example above, we are using an anonymous function as the factory function
This function should return the `currencyConverter` service instance.
Back to the initial question: How does the `InvoiceController` get a reference to the `currencyConverter` function?
-In Angular, this is done by simply defining arguments on the constructor function. With this, the injector
+In AngularJS, this is done by simply defining arguments on the constructor function. With this, the injector
is able to create the objects in the right order and pass the previously created objects into the
factories of the objects that depend on them.
-In our example, the `InvoiceController` has an argument named `currencyConverter`. By this, Angular knows about the
+In our example, the `InvoiceController` has an argument named `currencyConverter`. By this, AngularJS knows about the
dependency between the controller and the service and calls the controller with the service instance as argument.
The last thing that changed in the example between the previous section and this section is that we
now pass an array to the `module.controller` function, instead of a plain function. The array first
contains the names of the service dependencies that the controller needs. The last entry
in the array is the controller constructor function.
-Angular uses this array syntax to define the dependencies so that the DI also works after minifying
+AngularJS uses this array syntax to define the dependencies so that the DI also works after minifying
the code, which will most probably rename the argument name of the controller constructor function
to something shorter like `a`.
## Accessing the backend
Let's finish our example by fetching the exchange rates from the Yahoo Finance API.
-The following example shows how this is done with Angular:
+The following example shows how this is done with AngularJS:
@@ -380,7 +380,7 @@ The following example shows how this is done with Angular:
What changed?
Our `currencyConverter` service of the `finance` module now uses the {@link ng.$http `$http`}, a
-built-in service provided by Angular for accessing a server backend. `$http` is a wrapper around
+built-in service provided by AngularJS for accessing a server backend. `$http` is a wrapper around
[`XMLHttpRequest`](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest)
and [JSONP](http://en.wikipedia.org/wiki/JSONP) transports.
diff --git a/docs/content/guide/controller.ngdoc b/docs/content/guide/controller.ngdoc
index 748de9b4c2aa..79bb77e0c378 100644
--- a/docs/content/guide/controller.ngdoc
+++ b/docs/content/guide/controller.ngdoc
@@ -5,11 +5,11 @@
# Understanding Controllers
-In Angular, a Controller is defined by a JavaScript **constructor function** that is used to augment the
-{@link scope Angular Scope}.
+In AngularJS, a Controller is defined by a JavaScript **constructor function** that is used to augment the
+{@link scope AngularJS Scope}.
When a Controller is attached to the DOM via the {@link ng.directive:ngController ng-controller}
-directive, Angular will instantiate a new Controller object, using the specified Controller's
+directive, AngularJS will instantiate a new Controller object, using the specified Controller's
**constructor function**. A new **child scope** will be created and made available as an injectable
parameter to the Controller's constructor function as `$scope`.
@@ -24,18 +24,18 @@ Use controllers to:
Do not use controllers to:
- Manipulate DOM — Controllers should contain only business logic.
- Putting any presentation logic into Controllers significantly affects its testability. Angular
+ Putting any presentation logic into Controllers significantly affects its testability. AngularJS
has {@link databinding databinding} for most cases and {@link guide/directive directives} to
encapsulate manual DOM manipulation.
-- Format input — Use {@link forms angular form controls} instead.
-- Filter output — Use {@link guide/filter angular filters} instead.
-- Share code or state across controllers — Use {@link services angular
+- Format input — Use {@link forms AngularJS form controls} instead.
+- Filter output — Use {@link guide/filter AngularJS filters} instead.
+- Share code or state across controllers — Use {@link services AngularJS
services} instead.
- Manage the life-cycle of other components (for example, to create service instances).
## Setting up the initial state of a `$scope` object
-Typically, when you create an application you need to set up the initial state for the Angular
+Typically, when you create an application you need to set up the initial state for the AngularJS
`$scope`. You set up the initial state of a scope by attaching properties to the `$scope` object.
The properties contain the **view model** (the model that will be presented by the view). All the
`$scope` properties will be available to the {@link templates template} at the point in the DOM where the Controller
@@ -52,13 +52,13 @@ myApp.controller('GreetingController', ['$scope', function($scope) {
}]);
```
-We create an {@link module Angular Module}, `myApp`, for our application. Then we add the controller's
+We create an {@link module AngularJS Module}, `myApp`, for our application. Then we add the controller's
constructor function to the module using the `.controller()` method. This keeps the controller's
constructor function out of the global scope.
-Angular templates work differently. First the template (which is the uncompiled HTML along with +AngularJS templates work differently. First the template (which is the uncompiled HTML along with any additional markup or directives) is compiled on the browser. The compilation step produces a live view. Any changes to the view are immediately reflected in the model, and any changes in the model are propagated to the view. The model is the single-source-of-truth for the application @@ -36,5 +36,5 @@ isolation without the view and the related DOM/browser dependency. ## Related Topics -* {@link scope Angular Scopes} -* {@link templates Angular Templates} +* {@link scope AngularJS Scopes} +* {@link templates AngularJS Templates} diff --git a/docs/content/guide/decorators.ngdoc b/docs/content/guide/decorators.ngdoc index d143ac4b287a..2e8bc0e2a528 100644 --- a/docs/content/guide/decorators.ngdoc +++ b/docs/content/guide/decorators.ngdoc @@ -13,7 +13,7 @@ ## What are decorators? Decorators are a design pattern that is used to separate modification or *decoration* of a class without modifying the -original source code. In Angular, decorators are functions that allow a service, directive or filter to be modified +original source code. In AngularJS, decorators are functions that allow a service, directive or filter to be modified prior to its usage. ## How to use decorators diff --git a/docs/content/guide/di.ngdoc b/docs/content/guide/di.ngdoc index 0701ef6d1fc8..1b7a0cbbdfc2 100644 --- a/docs/content/guide/di.ngdoc +++ b/docs/content/guide/di.ngdoc @@ -8,13 +8,13 @@ Dependency Injection (DI) is a software design pattern that deals with how components get hold of their dependencies. -The Angular injector subsystem is in charge of creating components, resolving their dependencies, +The AngularJS injector subsystem is in charge of creating components, resolving their dependencies, and providing them to other components as requested. ## Using Dependency Injection -DI is pervasive throughout Angular. You can use it when defining components or when providing `run` +DI is pervasive throughout AngularJS. You can use it when defining components or when providing `run` and `config` blocks for a module. - Components such as services, directives, filters, and animations are defined by an injectable @@ -100,7 +100,7 @@ Moreover, additional dependencies are made available to Controllers: ## Dependency Annotation -Angular invokes certain functions (like service factories and controllers) via the injector. +AngularJS invokes certain functions (like service factories and controllers) via the injector. You need to annotate these functions so that the injector knows what services to inject into the function. There are three ways of annotating your code with service name information: @@ -204,11 +204,11 @@ angular.module('myApp', []) // $rootScope is implicitly injected }) .run(['willBreak', function(willBreak) { - // Angular will throw when this runs + // AngularJS will throw when this runs }]); ``` -When the `willBreak` service is instantiated, Angular will throw an error because of strict mode. +When the `willBreak` service is instantiated, AngularJS will throw an error because of strict mode. This is useful when using a tool like [ng-annotate](https://github.com/olov/ng-annotate) to ensure that all of your application components have annotations. @@ -225,7 +225,7 @@ angular.bootstrap(document, ['myApp'], { ## Why Dependency Injection? -This section motivates and explains Angular's use of DI. For how to use DI, see above. +This section motivates and explains AngularJS's use of DI. For how to use DI, see above. For in-depth discussion about DI, see [Dependency Injection](http://en.wikipedia.org/wiki/Dependency_injection) at Wikipedia, @@ -264,7 +264,7 @@ code that constructs `SomeClass`.
-To manage the responsibility of dependency creation, each Angular application has an {@link
+To manage the responsibility of dependency creation, each AngularJS application has an {@link
angular.injector injector}. The injector is a
[service locator](http://en.wikipedia.org/wiki/Service_locator_pattern) that is responsible for
construction and lookup of dependencies.
@@ -290,7 +290,7 @@ myModule.factory('greeter', function($window) {
```
Create a new injector that can provide components defined in our `myModule` module and request our
-`greeter` service from the injector. (This is usually done automatically by angular bootstrap).
+`greeter` service from the injector. (This is usually done automatically by AngularJS bootstrap).
```js
var injector = angular.injector(['ng', 'myModule']);
@@ -317,7 +317,7 @@ function MyController($scope, greeter) {
}
```
-When Angular compiles the HTML, it processes the `ng-controller` directive, which in turn
+When AngularJS compiles the HTML, it processes the `ng-controller` directive, which in turn
asks the injector to create an instance of the controller and its dependencies.
```js
@@ -332,6 +332,6 @@ This is the best outcome. The application code simply declares the dependencies
having to deal with the injector. This setup does not break the Law of Demeter.
`templateUrl` can also be a function which returns the URL of an HTML template to be loaded and
-used for the directive. Angular will call the `templateUrl` function with two parameters: the
+used for the directive. AngularJS will call the `templateUrl` function with two parameters: the
element that the directive was called on, and an `attr` object associated with that element.
We have used an **inline injection annotation** to explicitly specify the dependency
-of the Controller on the `$scope` service provided by Angular. See the guide on
+of the Controller on the `$scope` service provided by AngularJS. See the guide on
{@link guide/di Dependency Injection} for more information.
@@ -88,7 +88,7 @@ myApp.controller('DoubleController', ['$scope', function($scope) {
}]);
```
-Once the Controller has been attached to the DOM, the `double` method can be invoked in an Angular
+Once the Controller has been attached to the DOM, the `double` method can be invoked in an AngularJS
expression in the template:
```js
@@ -99,7 +99,7 @@ expression in the template:
As discussed in the {@link concepts Concepts} section of this guide, any
objects (or primitives) assigned to the scope become model properties. Any methods assigned to
-the scope are available in the template/view, and can be invoked via angular expressions
+the scope are available in the template/view, and can be invoked via AngularJS expressions
and `ng` event handler directives (e.g. {@link ng.directive:ngClick ngClick}).
## Using Controllers Correctly
@@ -113,7 +113,7 @@ This is discussed in the {@link di Dependency Injection} and {@link services
Services} sections of this guide.
-# Associating Controllers with Angular Scope Objects
+# Associating Controllers with AngularJS Scope Objects
You can associate Controllers with scope objects implicitly via the {@link ng.directive:ngController ngController
directive} or {@link ngRoute.$route $route service}.
@@ -121,7 +121,7 @@ directive} or {@link ngRoute.$route $route service}.
## Simple Spicy Controller Example
-To illustrate further how Controller components work in Angular, let's create a little app with the
+To illustrate further how Controller components work in AngularJS, let's create a little app with the
following components:
- A {@link templates template} with two buttons and a simple message
diff --git a/docs/content/guide/css-styling.ngdoc b/docs/content/guide/css-styling.ngdoc
index 1f1bfc178bf0..2bf2a0508aa9 100644
--- a/docs/content/guide/css-styling.ngdoc
+++ b/docs/content/guide/css-styling.ngdoc
@@ -4,38 +4,38 @@
@description
-Angular sets these CSS classes. It is up to your application to provide useful styling.
+AngularJS sets these CSS classes. It is up to your application to provide useful styling.
-# CSS classes used by angular
+# CSS classes used by AngularJS
* `ng-scope`
- - **Usage:** angular applies this class to any element for which a new {@link $rootScope scope}
+ - **Usage:** AngularJS applies this class to any element for which a new {@link $rootScope scope}
is defined. (see {@link guide/scope scope} guide for more information about scopes)
* `ng-isolate-scope`
- - **Usage:** angular applies this class to any element for which a new
+ - **Usage:** AngularJS applies this class to any element for which a new
{@link guide/directive#isolating-the-scope-of-a-directive isolate scope} is defined.
* `ng-binding`
- - **Usage:** angular applies this class to any element that is attached to a data binding, via `ng-bind` or
+ - **Usage:** AngularJS applies this class to any element that is attached to a data binding, via `ng-bind` or
`{{}}` curly braces, for example. (see {@link guide/databinding databinding} guide)
* `ng-invalid`, `ng-valid`
- - **Usage:** angular applies this class to a form control widget element if that element's input does
+ - **Usage:** AngularJS applies this class to a form control widget element if that element's input does
not pass validation. (see {@link ng.directive:input input} directive)
* `ng-pristine`, `ng-dirty`
- - **Usage:** angular {@link ng.directive:ngModel ngModel} directive applies `ng-pristine` class
+ - **Usage:** AngularJS {@link ng.directive:ngModel ngModel} directive applies `ng-pristine` class
to a new form control widget which did not have user interaction. Once the user interacts with
the form control, the class is changed to `ng-dirty`.
* `ng-touched`, `ng-untouched`
- - **Usage:** angular {@link ng.directive:ngModel ngModel} directive applies `ng-untouched` class
+ - **Usage:** AngularJS {@link ng.directive:ngModel ngModel} directive applies `ng-untouched` class
to a new form control widget which has not been blurred. Once the user blurs the form control,
the class is changed to `ng-touched`.
## Related Topics
-* {@link guide/templates Angular Templates}
-* {@link guide/forms Angular Forms}
+* {@link guide/templates AngularJS Templates}
+* {@link guide/forms AngularJS Forms}
diff --git a/docs/content/guide/databinding.ngdoc b/docs/content/guide/databinding.ngdoc
index f435c1b3cd02..a9ca961e526e 100644
--- a/docs/content/guide/databinding.ngdoc
+++ b/docs/content/guide/databinding.ngdoc
@@ -5,8 +5,8 @@
# Data Binding
-Data-binding in Angular apps is the automatic synchronization of data between the model and view
-components. The way that Angular implements data-binding lets you treat the model as the
+Data-binding in AngularJS apps is the automatic synchronization of data between the model and view
+components. The way that AngularJS implements data-binding lets you treat the model as the
single-source-of-truth in your application. The view is a projection of the model at all times.
When the model changes, the view reflects the change, and vice versa.
@@ -19,10 +19,10 @@ or related sections of the view are NOT automatically reflected in the view. Wor
that the user makes to the view are not reflected in the model. This means that the developer has
to write code that constantly syncs the view with the model and the model with the view.
-## Data Binding in Angular Templates
+## Data Binding in AngularJS Templates
-Angular templates work differently. First the template (which is the uncompiled HTML along with +AngularJS templates work differently. First the template (which is the uncompiled HTML along with any additional markup or directives) is compiled on the browser. The compilation step produces a live view. Any changes to the view are immediately reflected in the model, and any changes in the model are propagated to the view. The model is the single-source-of-truth for the application @@ -36,5 +36,5 @@ isolation without the view and the related DOM/browser dependency. ## Related Topics -* {@link scope Angular Scopes} -* {@link templates Angular Templates} +* {@link scope AngularJS Scopes} +* {@link templates AngularJS Templates} diff --git a/docs/content/guide/decorators.ngdoc b/docs/content/guide/decorators.ngdoc index d143ac4b287a..2e8bc0e2a528 100644 --- a/docs/content/guide/decorators.ngdoc +++ b/docs/content/guide/decorators.ngdoc @@ -13,7 +13,7 @@ ## What are decorators? Decorators are a design pattern that is used to separate modification or *decoration* of a class without modifying the -original source code. In Angular, decorators are functions that allow a service, directive or filter to be modified +original source code. In AngularJS, decorators are functions that allow a service, directive or filter to be modified prior to its usage. ## How to use decorators diff --git a/docs/content/guide/di.ngdoc b/docs/content/guide/di.ngdoc index 0701ef6d1fc8..1b7a0cbbdfc2 100644 --- a/docs/content/guide/di.ngdoc +++ b/docs/content/guide/di.ngdoc @@ -8,13 +8,13 @@ Dependency Injection (DI) is a software design pattern that deals with how components get hold of their dependencies. -The Angular injector subsystem is in charge of creating components, resolving their dependencies, +The AngularJS injector subsystem is in charge of creating components, resolving their dependencies, and providing them to other components as requested. ## Using Dependency Injection -DI is pervasive throughout Angular. You can use it when defining components or when providing `run` +DI is pervasive throughout AngularJS. You can use it when defining components or when providing `run` and `config` blocks for a module. - Components such as services, directives, filters, and animations are defined by an injectable @@ -100,7 +100,7 @@ Moreover, additional dependencies are made available to Controllers: ## Dependency Annotation -Angular invokes certain functions (like service factories and controllers) via the injector. +AngularJS invokes certain functions (like service factories and controllers) via the injector. You need to annotate these functions so that the injector knows what services to inject into the function. There are three ways of annotating your code with service name information: @@ -204,11 +204,11 @@ angular.module('myApp', []) // $rootScope is implicitly injected }) .run(['willBreak', function(willBreak) { - // Angular will throw when this runs + // AngularJS will throw when this runs }]); ``` -When the `willBreak` service is instantiated, Angular will throw an error because of strict mode. +When the `willBreak` service is instantiated, AngularJS will throw an error because of strict mode. This is useful when using a tool like [ng-annotate](https://github.com/olov/ng-annotate) to ensure that all of your application components have annotations. @@ -225,7 +225,7 @@ angular.bootstrap(document, ['myApp'], { ## Why Dependency Injection? -This section motivates and explains Angular's use of DI. For how to use DI, see above. +This section motivates and explains AngularJS's use of DI. For how to use DI, see above. For in-depth discussion about DI, see [Dependency Injection](http://en.wikipedia.org/wiki/Dependency_injection) at Wikipedia, @@ -264,7 +264,7 @@ code that constructs `SomeClass`.
-To manage the responsibility of dependency creation, each Angular application has an {@link
+To manage the responsibility of dependency creation, each AngularJS application has an {@link
angular.injector injector}. The injector is a
[service locator](http://en.wikipedia.org/wiki/Service_locator_pattern) that is responsible for
construction and lookup of dependencies.
@@ -290,7 +290,7 @@ myModule.factory('greeter', function($window) {
```
Create a new injector that can provide components defined in our `myModule` module and request our
-`greeter` service from the injector. (This is usually done automatically by angular bootstrap).
+`greeter` service from the injector. (This is usually done automatically by AngularJS bootstrap).
```js
var injector = angular.injector(['ng', 'myModule']);
@@ -317,7 +317,7 @@ function MyController($scope, greeter) {
}
```
-When Angular compiles the HTML, it processes the `ng-controller` directive, which in turn
+When AngularJS compiles the HTML, it processes the `ng-controller` directive, which in turn
asks the injector to create an instance of the controller and its dependencies.
```js
@@ -332,6 +332,6 @@ This is the best outcome. The application code simply declares the dependencies
having to deal with the injector. This setup does not break the Law of Demeter.
-**Note:** Angular uses
+**Note:** AngularJS uses
[**constructor injection**](http://misko.hevery.com/2009/02/19/constructor-injection-vs-setter-injection/).
diff --git a/docs/content/guide/directive.ngdoc b/docs/content/guide/directive.ngdoc
index adf4f41f0404..b573b847d167 100644
--- a/docs/content/guide/directive.ngdoc
+++ b/docs/content/guide/directive.ngdoc
@@ -24,9 +24,9 @@ name, comment or CSS class) that tell AngularJS's **HTML compiler** ({@link ng.$
to attach a specified behavior to that DOM element (e.g. via event listeners), or even to transform
the DOM element and its children.
-Angular comes with a set of these directives built-in, like `ngBind`, `ngModel`, and `ngClass`.
-Much like you create controllers and services, you can create your own directives for Angular to use.
-When Angular {@link guide/bootstrap bootstraps} your application, the
+AngularJS comes with a set of these directives built-in, like `ngBind`, `ngModel`, and `ngClass`.
+Much like you create controllers and services, you can create your own directives for AngularJS to use.
+When AngularJS {@link guide/bootstrap bootstraps} your application, the
{@link guide/compiler HTML compiler} traverses the DOM matching directives against the DOM elements.
@@ -41,7 +41,7 @@ mirrors the process of compiling source code in
## Matching Directives
-Before we can write a directive, we need to know how Angular's {@link guide/compiler HTML compiler}
+Before we can write a directive, we need to know how AngularJS's {@link guide/compiler HTML compiler}
determines when to use a given directive.
Similar to the terminology used when an [element **matches** a selector](https://developer.mozilla.org/en-US/docs/Web/API/Element.matches), we say an element **matches** a
@@ -67,7 +67,7 @@ And the following `` element **matches** the `person` directive:
### Normalization
-Angular **normalizes** an element's tag and attribute name to determine which elements match which
+AngularJS **normalizes** an element's tag and attribute name to determine which elements match which
directives. We typically refer to directives by their case-sensitive
[camelCase](http://en.wikipedia.org/wiki/CamelCase) **normalized** name (e.g. `ngModel`).
However, since HTML is case-insensitive, we refer to directives in the DOM by lower-case
@@ -122,7 +122,7 @@ The other forms shown above are accepted for legacy reasons but we advise you to
`$compile` can match directives based on element names, attributes, class names, as well as comments.
-All of the Angular-provided directives match attribute name, tag name, comments, or class name.
+All of the AngularJS-provided directives match attribute name, tag name, comments, or class name.
The following demonstrates the various ways a directive (`myDir` in this case) can be referenced
from within a template:
@@ -172,7 +172,7 @@ and compilation process.
directive names. For instance, if you created a `` directive, it would be problematic if HTML7
introduced the same element. A two or three letter prefix (e.g. `btfCarousel`) works well. Similarly, do
not prefix your own directives with `ng` or they might conflict with directives included in a future
-version of Angular.
+version of AngularJS.
For the following examples, we'll use the prefix `my` (e.g. `myCustomer`).
@@ -251,7 +251,7 @@ using `templateUrl` instead:
@@ -538,7 +538,7 @@ directive logic will be put.
`link` takes a function with the following signature,
`function link(scope, element, attrs, controller, transcludeFn) { ... }`, where:
-* `scope` is an Angular scope object.
+* `scope` is an AngularJS scope object.
* `element` is the jqLite-wrapped element that this directive matches.
* `attrs` is a hash object with key-value pairs of normalized attribute names and their
corresponding attribute values.
@@ -608,7 +608,7 @@ function.
We register an event `element.on('$destroy', ...)`. What fires this `$destroy` event?
There are a few special events that AngularJS emits. When a DOM node that has been compiled
-with Angular's compiler is destroyed, it emits a `$destroy` event. Similarly, when an AngularJS
+with AngularJS's compiler is destroyed, it emits a `$destroy` event. Similarly, when an AngularJS
scope is destroyed, it broadcasts a `$destroy` event to listening scopes.
By listening to this event, you can remove event listeners that might cause memory leaks.
diff --git a/docs/content/guide/e2e-testing.ngdoc b/docs/content/guide/e2e-testing.ngdoc
index 6953d47da81c..4593d10716d3 100644
--- a/docs/content/guide/e2e-testing.ngdoc
+++ b/docs/content/guide/e2e-testing.ngdoc
@@ -7,7 +7,7 @@
![]()
` elements, you cannot bind more than one expression to the
`src` or `action` attribute of elements.
-This is one of several improvements to security introduces by Angular 1.2.
+This is one of several improvements to security introduces by AngularJS 1.2.
Concatenating expressions makes it hard to understand whether some combination of concatenated
values are unsafe to use and potentially subject to XSS vulnerabilities. To simplify the task of
@@ -2652,7 +2652,7 @@ See [38deedd6](https://github.com/angular/angular.js/commit/38deedd6e3d806eb8262
DOM event handlers execute arbitrary JavaScript code. Using an interpolation for such handlers
means that the interpolated value is a JS string that is evaluated. Storing or generating such
strings is error prone and leads to XSS vulnerabilities. On the other hand, `ngClick` and other
-Angular specific event handlers evaluate Angular expressions in non-window (Scope) context which
+AngularJS specific event handlers evaluate AngularJS expressions in non-window (Scope) context which
makes them much safer.
To migrate the code follow the example below:
@@ -2979,7 +2979,7 @@ See [1adf29af](https://github.com/angular/angular.js/commit/1adf29af13890d612868
### Isolate scope only exposed to directives with `scope` property
If you declare a scope option on a directive, that directive will have an
-[isolate scope](https://github.com/angular/angular.js/wiki/Understanding-Scopes). In Angular 1.0, if a
+[isolate scope](https://github.com/angular/angular.js/wiki/Understanding-Scopes). In AngularJS 1.0, if a
directive with an isolate scope is used on an element, all directives on that same element have access
to the same isolate scope. For example, say we have the following directives:
@@ -3010,12 +3010,12 @@ Now what happens if we use both directives on the same element?
```
-In Angular 1.0, the nonIsolateScope directive will have access to the isolateScope directive’s scope. The
-log statements will print the same id, because the scope is the same. But in Angular 1.2, the nonIsolateScope
+In AngularJS 1.0, the nonIsolateScope directive will have access to the isolateScope directive’s scope. The
+log statements will print the same id, because the scope is the same. But in AngularJS 1.2, the nonIsolateScope
will not use the same scope as isolateScope. Instead, it will inherit the parent scope. The log statements
will print different id’s.
-If your code depends on the Angular 1.0 behavior (non-isolate directive needs to access state
+If your code depends on the AngularJS 1.0 behavior (non-isolate directive needs to access state
from within the isolate scope), change the isolate directive to use scope locals to pass these explicitly:
**Before**
@@ -3070,13 +3070,13 @@ See [79223eae](https://github.com/angular/angular.js/commit/79223eae502283889334
This change introduces the notion of "private" properties (properties
whose names begin and/or end with an underscore) on the scope chain.
-These properties will not be available to Angular expressions (i.e. {{
+These properties will not be available to AngularJS expressions (i.e. {{
}} interpolation in templates and strings passed to `$parse`) They are
freely available to JavaScript code (as before).
**Motivation**
-Angular expressions execute in a limited context. They do not have
+AngularJS expressions execute in a limited context. They do not have
direct access to the global scope, `window`, `document` or the Function
constructor. However, they have direct access to names/properties on
the scope chain. It has been a long standing best practice to keep
@@ -3085,17 +3085,17 @@ controller.) That's easier said than done for two reasons:
1. JavaScript does not have a notion of private properties so if you need
someone on the scope chain for JavaScript use, you also expose it to
-Angular expressions
+AngularJS expressions
2. The new `controller as` syntax that's now in increased usage exposes the
entire controller on the scope chain greatly increasing the exposed surface.
-Though Angular expressions are written and controlled by the developer, they:
+Though AngularJS expressions are written and controlled by the developer, they:
1. Typically deal with user input
2. Don't get the kind of test coverage that JavaScript code would
This commit provides a way, via a naming convention, to allow restricting properties from
-controllers/scopes. This means Angular expressions can access only those properties that
+controllers/scopes. This means AngularJS expressions can access only those properties that
are actually needed by the expressions.
See [3d6a89e8](https://github.com/angular/angular.js/commit/3d6a89e8888b14ae5cb5640464e12b7811853c7e).
@@ -3114,7 +3114,7 @@ See [d87fa004](https://github.com/angular/angular.js/commit/d87fa0042375b025b98c
### Uncommon region-specific local files were removed from i18n
AngularJS uses the Google Closure library's locale files. The following locales were removed from
-Closure, so Angular is not able to continue to support them:
+Closure, so AngularJS is not able to continue to support them:
`chr`, `cy`, `el-polyton`, `en-zz`, `fr-rw`, `fr-sn`, `fr-td`, `fr-tg`, `haw`, `it-ch`, `ln-cg`,
`mo`, `ms-bn`, `nl-aw`, `nl-be`, `pt-ao`, `pt-gw`, `pt-mz`, `pt-st`, `ro-md`, `ru-md`, `ru-ua`,
diff --git a/docs/content/guide/module.ngdoc b/docs/content/guide/module.ngdoc
index 62ab1c51f73f..359dd19cca8a 100644
--- a/docs/content/guide/module.ngdoc
+++ b/docs/content/guide/module.ngdoc
@@ -13,7 +13,7 @@ services, filters, directives, etc.
Most applications have a main method that instantiates and wires together the different parts of
the application.
-Angular apps don't have a main method. Instead modules declaratively specify how an application
+AngularJS apps don't have a main method. Instead modules declaratively specify how an application
should be bootstrapped. There are several advantages to this approach:
* The declarative process is easier to understand.
@@ -189,13 +189,13 @@ angular.module('myModule', []).
```
-Notice that Angular automatically places `ng-scope` class on elements where scopes are
+Notice that AngularJS automatically places `ng-scope` class on elements where scopes are
attached. The `
**Note:** In the past, end-to-end testing could be done with a deprecated tool called
-[Angular Scenario Runner](http://code.angularjs.org/1.2.16/docs/guide/e2e-testing). That tool
+[AngularJS Scenario Runner](http://code.angularjs.org/1.2.16/docs/guide/e2e-testing). That tool
is now in maintenance mode.
@@ -19,7 +19,7 @@ these problems.
We have built [Protractor](https://github.com/angular/protractor), an end
to end test runner which simulates user interactions that will help you verify the health of your
-Angular application.
+AngularJS application.
## Using Protractor
@@ -76,7 +76,7 @@ filter the list of items.
## Example
See the [angular-seed](https://github.com/angular/angular-seed) project for more examples, or look
-at the embedded examples in the Angular documentation (For example, {@link $http $http}
+at the embedded examples in the AngularJS documentation (For example, {@link $http $http}
has an end-to-end test in the example under the `protractor.js` tag).
## Caveats
diff --git a/docs/content/guide/expression.ngdoc b/docs/content/guide/expression.ngdoc
index 24326b6abae1..9d795349ee92 100644
--- a/docs/content/guide/expression.ngdoc
+++ b/docs/content/guide/expression.ngdoc
@@ -3,13 +3,13 @@
@sortOrder 270
@description
-# Angular Expressions
+# AngularJS Expressions
-Angular expressions are JavaScript-like code snippets that are mainly placed in
+AngularJS expressions are JavaScript-like code snippets that are mainly placed in
interpolation bindings such as `{{ textBinding }}`,
but also used directly in directive attributes such as `ng-click="functionExpression()"`.
-For example, these are valid expressions in Angular:
+For example, these are valid expressions in AngularJS:
* `1+2`
* `a+b`
@@ -17,37 +17,37 @@ For example, these are valid expressions in Angular:
* `items[index]`
-## Angular Expressions vs. JavaScript Expressions
+## AngularJS Expressions vs. JavaScript Expressions
-Angular expressions are like JavaScript expressions with the following differences:
+AngularJS expressions are like JavaScript expressions with the following differences:
* **Context:** JavaScript expressions are evaluated against the global `window`.
- In Angular, expressions are evaluated against a {@link ng.$rootScope.Scope `scope`} object.
+ In AngularJS, expressions are evaluated against a {@link ng.$rootScope.Scope `scope`} object.
* **Forgiving:** In JavaScript, trying to evaluate undefined properties generates `ReferenceError`
- or `TypeError`. In Angular, expression evaluation is forgiving to `undefined` and `null`.
+ or `TypeError`. In AngularJS, expression evaluation is forgiving to `undefined` and `null`.
* **Filters:** You can use {@link guide/filter filters} within expressions to format data before
displaying it.
- * **No Control Flow Statements:** You cannot use the following in an Angular expression:
+ * **No Control Flow Statements:** You cannot use the following in an AngularJS expression:
conditionals, loops, or exceptions.
- * **No Function Declarations:** You cannot declare functions in an Angular expression,
+ * **No Function Declarations:** You cannot declare functions in an AngularJS expression,
even inside `ng-init` directive.
* **No RegExp Creation With Literal Notation:** You cannot create regular expressions
- in an Angular expression.
+ in an AngularJS expression.
- * **No Object Creation With New Operator:** You cannot use `new` operator in an Angular expression.
+ * **No Object Creation With New Operator:** You cannot use `new` operator in an AngularJS expression.
* **No Bitwise, Comma, And Void Operators:** You cannot use
[Bitwise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Bitwise_Operators),
- `,` or `void` operators in an Angular expression.
+ `,` or `void` operators in an AngularJS expression.
If you want to run more complex JavaScript code, you should make it a controller method and call
-the method from your view. If you want to `eval()` an Angular expression yourself, use the
+the method from your view. If you want to `eval()` an AngularJS expression yourself, use the
{@link ng.$rootScope.Scope#$eval `$eval()`} method.
## Example
@@ -110,10 +110,10 @@ You can try evaluating different expressions here:
## Context
-Angular does not use JavaScript's `eval()` to evaluate expressions. Instead Angular's
+AngularJS does not use JavaScript's `eval()` to evaluate expressions. Instead AngularJS's
{@link ng.$parse $parse} service processes these expressions.
-Angular expressions do not have direct access to global variables like `window`, `document` or `location`.
+AngularJS expressions do not have direct access to global variables like `window`, `document` or `location`.
This restriction is intentional. It prevents accidental access to the global state – a common source of subtle bugs.
Instead use services like `$window` and `$location` in functions on controllers, which are then called from expressions.
@@ -180,7 +180,7 @@ Similarly, invoking a function `a.b.c()` on `undefined` or `null` simply returns
## No Control Flow Statements
Apart from the ternary operator (`a ? b : c`), you cannot write a control flow statement in an
-expression. The reason behind this is core to the Angular philosophy that application logic should
+expression. The reason behind this is core to the AngularJS philosophy that application logic should
be in controllers, not the views. If you need a real conditional, loop, or to throw from a view
expression, delegate to a JavaScript method instead.
diff --git a/docs/content/guide/external-resources.ngdoc b/docs/content/guide/external-resources.ngdoc
index bc2063187f52..072d7d7f4abb 100644
--- a/docs/content/guide/external-resources.ngdoc
+++ b/docs/content/guide/external-resources.ngdoc
@@ -3,9 +3,9 @@
@sortOrder 150
@description
-# External Angular 1 Resources
+# External AngularJS Resources
-This is a collection of external, 3rd party resources for learning and developing Angular.
+This is a collection of external, 3rd party resources for learning and developing AngularJS.
## Articles, Videos, and Projects
@@ -21,7 +21,7 @@ This is a collection of external, 3rd party resources for learning and developin
#### Application Structure & Style Guides
-* [Angular Styleguide](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md)
+* [AngularJS Styleguide](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md)
* [Architecture, file structure, components, one-way dataflow and best practices](https://github.com/toddmotto/angular-styleguide)
* [When to use directives, controllers or services](http://kirkbushell.me/when-to-use-directives-controllers-or-services-in-angular/)
* [Service vs Factory](http://blog.thoughtram.io/angular/2015/07/07/service-vs-factory-once-and-for-all.html)
@@ -32,8 +32,8 @@ This is a collection of external, 3rd party resources for learning and developin
#### Mobile
-* [Angular on Mobile Guide](http://www.ng-newsletter.com/posts/angular-on-mobile.html)
-* [Angular and Cordova](http://devgirl.org/2013/06/10/quick-start-guide-phonegap-and-angularjs/)
+* [AngularJS on Mobile Guide](http://www.ng-newsletter.com/posts/angular-on-mobile.html)
+* [AngularJS and Cordova](http://devgirl.org/2013/06/10/quick-start-guide-phonegap-and-angularjs/)
* [Ionic Framework](http://ionicframework.com/)
#### Deployment
@@ -75,12 +75,12 @@ This is a collection of external, 3rd party resources for learning and developin
* **Getting Started:** [Comparison of the options for starting a new project](http://www.dancancro.com/comparison-of-angularjs-application-starters/)
* **Debugging:** [Batarang](https://chrome.google.com/webstore/detail/angularjs-batarang/ighdmehidhipcmcojjgiloacoafjmpfk?hl=en)
* **Editor support:** [Webstorm](http://plugins.jetbrains.com/plugin/6971) (and [video](http://www.youtube.com/watch?v=LJOyrSh1kDU)), [Sublime Text](https://github.com/angular-ui/AngularJS-sublime-package), [Visual Studio](http://madskristensen.net/post/angularjs-intellisense-in-visual-studio-2012), [Atom](https://github.com/angular-ui/AngularJS-Atom), [Vim](https://github.com/burnettk/vim-angular)
-* **Workflow:** [Yeoman.io](https://github.com/yeoman/generator-angular) and [Angular Yeoman Tutorial](http://www.sitepoint.com/kickstart-your-angularjs-development-with-yeoman-grunt-and-bower/)
+* **Workflow:** [Yeoman.io](https://github.com/yeoman/generator-angular) and [AngularJS Yeoman Tutorial](http://www.sitepoint.com/kickstart-your-angularjs-development-with-yeoman-grunt-and-bower/)
## Complementary Libraries
-This is a list of libraries that enhance Angular, add common UI components or integrate with other libraries.
-You can find a larger list of Angular external libraries at [ngmodules.org](http://ngmodules.org/).
+This is a list of libraries that enhance AngularJS, add common UI components or integrate with other libraries.
+You can find a larger list of AngularJS external libraries at [ngmodules.org](http://ngmodules.org/).
* **Advanced Routing:** [UI-Router](https://github.com/angular-ui/ui-router)
* **Authentication:** [Http Auth Interceptor](https://github.com/witoldsz/angular-http-auth)
@@ -98,21 +98,21 @@ You can find a larger list of Angular external libraries at [ngmodules.org](http
- Data Modeling [JS-Data-Angular](https://github.com/js-data/js-data-angular)
* **Fileupload:**
- [ng-file-upload](https://github.com/danialfarid/ng-file-upload)
- - [blueimp-fileupload for Angular](https://blueimp.github.io/jQuery-File-Upload/angularjs.html)
+ - [blueimp-fileupload for AngularJS](https://blueimp.github.io/jQuery-File-Upload/angularjs.html)
* **General UI Libraries:**
- - [Angular Material](https://material.angularjs.org/latest/)
- - [Angular UI Bootstrap](http://angular-ui.github.io/)
+ - [AngularJS Material](https://material.angularjs.org/latest/)
+ - [AngularJS UI Bootstrap](http://angular-ui.github.io/)
- [AngularStrap for Bootstrap 3](http://mgcrea.github.io/angular-strap/)
- [KendoUI](http://kendo-labs.github.io/angular-kendo/#/)
- [Wijmo](http://wijmo.com/tag/angularjs-2/)
* **Specific UI Elements:**
- [ngInfiniteScroll](https://sroze.github.io/ngInfiniteScroll/)
- [ngTable](https://github.com/esvit/ng-table)
- - [Angular UI Grid](http://angular-ui.github.io/grid)
+ - [AngularJS UI Grid](http://angular-ui.github.io/grid)
- [Toaster Notifications](https://github.com/jirikavi/AngularJS-Toaster)
- [textAngular Rich Text Editor / contenteditable](http://textangular.com/) (Rich Text Editor /
binding to contenteditable)
- - [Angular UI Map (Google Maps)](https://github.com/angular-ui/ui-map)
+ - [AngularJS UI Map (Google Maps)](https://github.com/angular-ui/ui-map)
## General Learning Resources
diff --git a/docs/content/guide/filter.ngdoc b/docs/content/guide/filter.ngdoc
index dc462c80b496..202dd8098d93 100644
--- a/docs/content/guide/filter.ngdoc
+++ b/docs/content/guide/filter.ngdoc
@@ -6,7 +6,7 @@
# Filters
Filters format the value of an expression for display to the user. They can be used in view
-templates, controllers or services. Angular comes with a collection of
+templates, controllers or services. AngularJS comes with a collection of
[built-in filters](api/ng/filter), but it is easy to define your own as well.
The underlying API is the {@link ng.$filterProvider}.
@@ -44,7 +44,7 @@ as inputs. Filters that receive [Objects](https://developer.mozilla.org/en-US/do
as input are executed on each `$digest`, as it would be too costly to track if the inputs have changed.
2. Filters that are marked as `$stateful` are also executed on each $digest.
-See {@link guide/filter#stateful-filters Stateful filters} for more information. Note that no Angular
+See {@link guide/filter#stateful-filters Stateful filters} for more information. Note that no AngularJS
core filters are $stateful.
@@ -110,12 +110,12 @@ function.
The filter function should be a [pure function](http://en.wikipedia.org/wiki/Pure_function), which
means that it should always return the same result given the same input arguments and should not affect
-external state, for example, other Angular services. Angular relies on this contract and will by default
+external state, for example, other AngularJS services. AngularJS relies on this contract and will by default
execute a filter only when the inputs to the function change.
{@link guide/filter#stateful-filters Stateful filters} are possible, but less performant.
-**Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+**Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
(`myapp_subsection_filterx`).
@@ -162,7 +162,7 @@ text upper-case.
### Stateful filters
It is strongly discouraged to write filters that are stateful, because the execution of those can't
-be optimized by Angular, which often leads to performance issues. Many stateful filters can be
+be optimized by AngularJS, which often leads to performance issues. Many stateful filters can be
converted into stateless filters just by exposing the hidden state as a model and turning it into an
argument for the filter.
diff --git a/docs/content/guide/forms.ngdoc b/docs/content/guide/forms.ngdoc
index 1fbd60dbe13f..4379b3573515 100644
--- a/docs/content/guide/forms.ngdoc
+++ b/docs/content/guide/forms.ngdoc
@@ -303,7 +303,7 @@ after last change.
## Custom Validation
-Angular provides basic implementation for most common HTML5 {@link ng.directive:input input}
+AngularJS provides basic implementation for most common HTML5 {@link ng.directive:input input}
types: ({@link input[text] text}, {@link input[number] number}, {@link input[url] url},
{@link input[email] email}, {@link input[date] date}, {@link input[radio] radio}, {@link input[checkbox] checkbox}),
as well as some directives for validation (`required`, `pattern`, `minlength`, `maxlength`,
@@ -314,7 +314,7 @@ the {@link ngModel.NgModelController `ngModelController`}. To get a hold of the
you require it in the directive as shown in the example below.
Each function in the `$validators` object receives the `modelValue` and the `viewValue`
-as parameters. Angular will then call `$setValidity` internally with the function's return value
+as parameters. AngularJS will then call `$setValidity` internally with the function's return value
(`true`: valid, `false`: invalid). The validation functions are executed every time an input
is changed (`$setViewValue` is called) or whenever the bound `model` changes.
Validation happens after successfully running `$parsers` and `$formatters`, respectively.
@@ -422,7 +422,7 @@ In the following example we create two directives:
## Modifying built-in validators
-Since Angular itself uses `$validators`, you can easily replace or remove built-in validators,
+Since AngularJS itself uses `$validators`, you can easily replace or remove built-in validators,
should you find it necessary. The following example shows you how to overwrite the email validator
in `input[email]` from a custom directive so that it requires a specific top-level domain,
`example.com` to be present.
@@ -451,10 +451,10 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
return {
require: '?ngModel',
link: function(scope, elm, attrs, ctrl) {
- // only apply the validator if ngModel is present and Angular has added the email validator
+ // only apply the validator if ngModel is present and AngularJS has added the email validator
if (ctrl && ctrl.$validators.email) {
- // this will overwrite the default Angular email validator
+ // this will overwrite the default AngularJS email validator
ctrl.$validators.email = function(modelValue) {
return ctrl.$isEmpty(modelValue) || EMAIL_REGEXP.test(modelValue);
};
@@ -467,7 +467,7 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
## Implementing custom form controls (using `ngModel`)
-Angular implements all of the basic HTML form controls ({@link ng.directive:input input},
+AngularJS implements all of the basic HTML form controls ({@link ng.directive:input input},
{@link ng.directive:select select}, {@link ng.directive:textarea textarea}),
which should be sufficient for most cases. However, if you need more flexibility,
you can write your own form control as a directive.
diff --git a/docs/content/guide/i18n.ngdoc b/docs/content/guide/i18n.ngdoc
index 8bb9f47c4b04..ebe28c2b57fc 100644
--- a/docs/content/guide/i18n.ngdoc
+++ b/docs/content/guide/i18n.ngdoc
@@ -13,9 +13,9 @@ other locale-specific bits (such as date or currency formats) out of the applica
application means providing translations and localized formats for the abstracted bits.
-## How does Angular support i18n/l10n?
+## How does AngularJS support i18n/l10n?
-Angular supports i18n/l10n for {@link ng.filter:date date}, {@link ng.filter:number number} and
+AngularJS supports i18n/l10n for {@link ng.filter:date date}, {@link ng.filter:number number} and
{@link ng.filter:currency currency} filters.
Localizable pluralization is supported via the {@link ng.directive:ngPluralize `ngPluralize`
@@ -23,11 +23,11 @@ directive}. Additionally, you can use {@link guide/i18n#messageformat-extension
`$interpolate` for localizable pluralization and gender support in all interpolations via the
`ngMessageFormat` module.
-All localizable Angular components depend on locale-specific rule sets managed by the {@link
+All localizable AngularJS components depend on locale-specific rule sets managed by the {@link
ng.$locale `$locale` service}.
-There are a few examples that showcase how to use Angular filters with various locale rule sets in the
-[`i18n/e2e` directory](https://github.com/angular/angular.js/tree/master/i18n/e2e) of the Angular
+There are a few examples that showcase how to use AngularJS filters with various locale rule sets in the
+[`i18n/e2e` directory](https://github.com/angular/angular.js/tree/master/i18n/e2e) of the AngularJS
source code.
@@ -41,20 +41,20 @@ also valid. See the [ICU](http://userguide.icu-project.org/locale) website for m
about using locale IDs.
-## Supported locales in Angular
+## Supported locales in AngularJS
-Angular separates number and datetime format rule sets into different files, each file for a
+AngularJS separates number and datetime format rule sets into different files, each file for a
particular locale. You can find a list of currently supported locales
[here](https://github.com/angular/angular.js/tree/master/src/ngLocale)
-## Providing locale rules to Angular
+## Providing locale rules to AngularJS
-There are two approaches to providing locale rules to Angular:
+There are two approaches to providing locale rules to AngularJS:
### 1. Pre-bundled rule sets
-You can pre-bundle the desired locale file with Angular by concatenating the content of the
+You can pre-bundle the desired locale file with AngularJS by concatenating the content of the
locale-specific file to the end of `angular.js` or `angular.min.js` file.
For example on *nix, to create an angular.js file that contains localization rules for german
@@ -63,7 +63,7 @@ locale, you can do the following:
`cat angular.js i18n/angular-locale_de-de.js > angular_de-de.js`
When the application containing `angular_de-de.js` script instead of the generic angular.js script
-starts, Angular is automatically pre-configured with localization rules for the german locale.
+starts, AngularJS is automatically pre-configured with localization rules for the german locale.
### 2. Including a locale script in `index.html`
@@ -93,12 +93,12 @@ an extra script needs to be loaded.
## Caveats
-Although Angular makes i18n convenient, there are several things you need to be conscious of as you
+Although AngularJS makes i18n convenient, there are several things you need to be conscious of as you
develop your app.
### Currency symbol
-Angular's {@link ng.filter:currency currency filter} allows you to use the default currency symbol
+AngularJS's {@link ng.filter:currency currency filter} allows you to use the default currency symbol
from the {@link ng.$locale locale service}, or you can provide the filter with a custom currency
symbol.
@@ -122,7 +122,7 @@ This is problematic because $1000 is not the same as ¥1000.
In this case, you need to override the default currency symbol by providing the
{@link ng.filter:currency} currency filter with a currency symbol as a parameter.
-If we change the above to `{{ 1000 | currency:"USD$"}}`, Angular will always show a balance of
+If we change the above to `{{ 1000 | currency:"USD$"}}`, AngularJS will always show a balance of
`USD$1000` regardless of locale.
### Translation length
@@ -135,16 +135,16 @@ as expected even when their contents vary greatly in content size.
### Timezones
-The Angular datetime filter uses the time zone settings of the browser. The same
+The AngularJS datetime filter uses the time zone settings of the browser. The same
application will show different time information depending on the time zone settings of the
-computer that the application is running on. Neither JavaScript nor Angular currently supports
+computer that the application is running on. Neither JavaScript nor AngularJS currently supports
displaying the date with a timezone specified by the developer.
## MessageFormat extensions
-You can write localizable plural and gender based messages in Angular interpolation expressions and
+You can write localizable plural and gender based messages in AngularJS interpolation expressions and
`$interpolate` calls.
This syntax extension is provided by way of the `ngMessageFormat` module that your application can
@@ -271,7 +271,7 @@ actual message text that occurs in curly braces. Whitespace is generally used t
Here, `NUMERIC_EXPRESSION` is an expression that evaluates to a numeric value based on which the
displayed message should change based on pluralization rules.
-Following the Angular expression, you would denote the plural extension syntax by the `, plural,`
+Following the AngularJS expression, you would denote the plural extension syntax by the `, plural,`
syntax element. The spaces there are optional.
This is followed by a list of selection keyword and corresponding message pairs. The "other"
@@ -303,7 +303,7 @@ later.)
#### Messages
Messages immediately follow a selection keyword and are optionally preceded by whitespace. They are
-written in single curly braces (`{}`). They may contain Angular interpolation syntax inside them.
+written in single curly braces (`{}`). They may contain AngularJS interpolation syntax inside them.
In addition, the `#` symbol is a placeholder for the actual numeric value of the expression.
### Simple plural example
@@ -316,7 +316,7 @@ In addition, the `#` symbol is a placeholder for the actual numeric value of the
}}
```
-Because these messages can themselves contain Angular expressions, you could also write this as
+Because these messages can themselves contain AngularJS expressions, you could also write this as
follows:
```text
@@ -342,7 +342,7 @@ explain this with an example.
}}
```
-When an `offset` is specified, the matching works as follows. First, the exact value of the Angular
+When an `offset` is specified, the matching works as follows. First, the exact value of the AngularJS
expression is matched against the exact matches (i.e. `=N` selectors) to find a match. If there is
one, that message is used. If there was no match, then the offset value is subtracted from the
value of the expression and locale specific pluralization rules are applied to this new value to
@@ -379,10 +379,10 @@ The syntax for gender based message selection looks like the following:
Please note that whitespace (including newline) is generally insignificant except as part of the
actual message text that occurs in curly braces. Whitespace is generally used to aid readability.
-Here, `EXPRESSION` is an Angular expression that evaluates to the gender of the person that
+Here, `EXPRESSION` is an AngularJS expression that evaluates to the gender of the person that
is used to select the message that should be displayed.
-The Angular expression is followed by `, select,` where the spaces are optional.
+The AngularJS expression is followed by `, select,` where the spaces are optional.
This is followed by a list of selection keyword and corresponding message pairs. The "other"
keyword and corresponding message are **required** but you may have as few or as many of the other
@@ -392,13 +392,13 @@ matching is **case-sensitive**.
#### Selection Keywords
Selection keywords are simple words like "male" and "female". The keyword, "other", and its
-corresponding message are required while others are optional. It is used when the Angular
+corresponding message are required while others are optional. It is used when the AngularJS
expression does not match (case-insensitively) any of the other keywords specified.
#### Messages
Messages immediately follow a selection keyword and are optionally preceded by whitespace. They are
-written in single curly braces (`{}`). They may contain Angular interpolation syntax inside them.
+written in single curly braces (`{}`). They may contain AngularJS interpolation syntax inside them.
### Simple gender example
@@ -412,8 +412,8 @@ written in single curly braces (`{}`). They may contain Angular interpolation s
### Nesting
-As mentioned in the syntax for plural and select, the embedded messages can contain Angular
-interpolation syntax. Since you can use MessageFormat extensions in Angular interpolation, this
+As mentioned in the syntax for plural and select, the embedded messages can contain AngularJS
+interpolation syntax. Since you can use MessageFormat extensions in AngularJS interpolation, this
allows you to nest plural and gender expressions in any order.
Please note that if these are intended to reach a translator and be translated, it is recommended
@@ -450,7 +450,7 @@ This syntax extension, while based on MessageFormat, has been designed to be bac
with existing AngularJS interpolation expressions. The key rule is simply this: **All
interpolations are done inside double curlies.** The top level comma operator after an expression
inside the double curlies causes MessageFormat extensions to be recognized. Such a top level comma
-is otherwise illegal in an Angular expression and is used by MessageFormat to specify the function
+is otherwise illegal in an AngularJS expression and is used by MessageFormat to specify the function
(such as plural/select) and it's related syntax.
To understand the extension, take a look at the ICU MessageFormat syntax as specified by the ICU
diff --git a/docs/content/guide/ie.ngdoc b/docs/content/guide/ie.ngdoc
index afe35b7ee4d0..8cc554e8ec01 100644
--- a/docs/content/guide/ie.ngdoc
+++ b/docs/content/guide/ie.ngdoc
@@ -13,7 +13,7 @@ addressing issues specific to IE8 or earlier.
This document describes the Internet Explorer (IE) idiosyncrasies when dealing with custom HTML
-attributes and tags. Read this document if you are planning on deploying your Angular application
+attributes and tags. Read this document if you are planning on deploying your AngularJS application
on IE.
The project currently supports and will attempt to fix bugs for IE9 and above. The continuous
@@ -25,16 +25,16 @@ We do not run tests on IE8 and below. A subset of the AngularJS functionality ma
browsers, but it is up to you to test and decide whether it works for your particular app.
-To ensure your Angular application works on IE please consider:
+To ensure your AngularJS application works on IE please consider:
1. Use `ng-style` tags instead of `style="{{ someCss }}"`. The latter works in Chrome and Firefox
but does not work in Internet Explorer <= 11 (the most recent version at time of writing).
2. For the `type` attribute of buttons, use `ng-attr-type` tags instead of
`type="{{ someExpression }}"`. If using the latter, Internet Explorer overwrites the expression
- with `type="submit"` before Angular has a chance to interpolate it.
+ with `type="submit"` before AngularJS has a chance to interpolate it.
3. For the `value` attribute of progress, use `ng-attr-value` tags instead of
`value="{{ someExpression}}"`. If using the latter, Internet Explorer overwrites the expression
- with `value="0"` before Angular has a chance to interpolate it.
+ with `value="0"` before AngularJS has a chance to interpolate it.
4. For the `placeholder` attribute of textarea, use `ng-attr-placeholder` tags instead
of `placeholder="{{ someExpression }}"`. If using the latter, Internet Explorer will error
on accessing the `nodeValue` on a parentless `TextNode` in Internet Explorer 10 & 11
diff --git a/docs/content/guide/index.ngdoc b/docs/content/guide/index.ngdoc
index 0edf4056aca8..b3cc1e5385d3 100644
--- a/docs/content/guide/index.ngdoc
+++ b/docs/content/guide/index.ngdoc
@@ -2,26 +2,26 @@
@name Developer Guide
@description
-# Guide to Angular 1 Documentation
+# Guide to AngularJS Documentation
-On this page, you will find a list of official Angular resources on various topics.
+On this page, you will find a list of official AngularJS resources on various topics.
-Just starting out with Angular 1? Try working through our step by step tutorial or try
+Just starting out with AngularJS? Try working through our step by step tutorial or try
building on our seed project.
-* {@link tutorial/index Official Angular 1 Tutorial}
-* [Angular Seed](https://github.com/angular/angular-seed)
+* {@link tutorial/index Official AngularJS Tutorial}
+* [AngularJS Seed](https://github.com/angular/angular-seed)
-Ready to find out more about Angular 1?
+Ready to find out more about AngularJS?
-* {@link guide/introduction What is Angular 1?}
+* {@link guide/introduction What is AngularJS?}
* {@link guide/concepts Conceptual Overview}
## Core Concepts
### Templates
-In Angular applications, you move the job of filling page templates with data from the server to the client. The result is a system better structured for dynamic page updates. Below are the core features you'll use.
+In AngularJS applications, you move the job of filling page templates with data from the server to the client. The result is a system better structured for dynamic page updates. Below are the core features you'll use.
* {@link guide/databinding Data binding}
* {@link guide/expression Expressions}
@@ -43,7 +43,7 @@ In Angular applications, you move the job of filling page templates with data fr
* **Animation:** {@link guide/animations Core concepts}, {@link ngAnimate ngAnimate API}
* **Security:** {@link guide/security Security Docs}, {@link ng.$sce Strict Contextual Escaping}, {@link ng.directive:ngCsp Content Security Policy}, {@link ngSanitize.$sanitize $sanitize}, [video](https://www.youtube.com/watch?v=18ifoT-Id54)
-* **Internationalization and Localization:** {@link guide/i18n Angular Guide to i18n and l10n}, {@link ng.filter:date date filter}, {@link ng.filter:currency currency filter}, [Creating multilingual support](http://www.novanet.no/blog/hallstein-brotan/dates/2013/10/creating-multilingual-support-using-angularjs/)
+* **Internationalization and Localization:** {@link guide/i18n AngularJS Guide to i18n and l10n}, {@link ng.filter:date date filter}, {@link ng.filter:currency currency filter}, [Creating multilingual support](http://www.novanet.no/blog/hallstein-brotan/dates/2013/10/creating-multilingual-support-using-angularjs/)
* **Touch events:** {@link ngTouch Touch events}
* **Accessibility:** {@link guide/accessibility ngAria}
@@ -58,7 +58,7 @@ In Angular applications, you move the job of filling page templates with data fr
We have set up a guide to many resources provided by the community, where you can find lots
of additional information and material on these topics, a list of complimentary libraries, and much more.
-* {@link guide/external-resources External Angular 1 resources}
+* {@link guide/external-resources External AngularJS resources}
## Getting Help
@@ -66,27 +66,27 @@ of additional information and material on these topics, a list of complimentary
The recipe for getting help on your unique issue is to create an example that could work (even if it doesn't) in a shareable example on [Plunker](http://plnkr.co/), [JSFiddle](http://jsfiddle.net/), or similar site and then post to one of the following:
* [Stackoverflow.com](http://stackoverflow.com/search?q=angularjs)
-* [Angular 1 mailing list](https://groups.google.com/forum/#!forum/angular)
-* [Angular 1 IRC channel](http://webchat.freenode.net/?channels=angularjs&uio=d4)
+* [AngularJS mailing list](https://groups.google.com/forum/#!forum/angular)
+* [AngularJS IRC channel](http://webchat.freenode.net/?channels=angularjs&uio=d4)
## Official Communications
Official announcements, news and releases are posted to our blog, G+ and Twitter:
-* [Angular Blog](http://blog.angularjs.org/)
+* [AngularJS Blog](http://blog.angularjs.org/)
* [Google+](https://plus.google.com/u/0/+AngularJS)
* [Twitter](https://twitter.com/angularjs)
-* [Angular on YouTube](http://youtube.com/angularjs)
+* [AngularJS on YouTube](http://youtube.com/angularjs)
-## Contributing to Angular 1
+## Contributing to AngularJS
-Though we have a core group of core contributors at Google, Angular is an open source project with hundreds of contributors.
-We'd love you to be one of them. When you're ready, please read the {@link misc/contribute Guide for contributing to Angular}.
+Though we have a core group of core contributors at Google, AngularJS is an open source project with hundreds of contributors.
+We'd love you to be one of them. When you're ready, please read the {@link misc/contribute Guide for contributing to AngularJS}.
## Something Missing?
-Didn't find what you're looking for here? Check out the {@link guide/external-resources External Angular 1 resources guide}.
+Didn't find what you're looking for here? Check out the {@link guide/external-resources External AngularJS resources guide}.
-If you have awesome Angular 1 resources that belong on that page, please tell us about them on
+If you have awesome AngularJS resources that belong on that page, please tell us about them on
[Google+](https://plus.google.com/u/0/+AngularJS) or [Twitter](https://twitter.com/angularjs).
diff --git a/docs/content/guide/interpolation.ngdoc b/docs/content/guide/interpolation.ngdoc
index 0053740a75c2..0cf11370b431 100644
--- a/docs/content/guide/interpolation.ngdoc
+++ b/docs/content/guide/interpolation.ngdoc
@@ -5,7 +5,7 @@
# Interpolation and data-binding
-Interpolation markup with embedded {@link guide/expression expressions} is used by Angular to
+Interpolation markup with embedded {@link guide/expression expressions} is used by AngularJS to
provide data-binding to text nodes and attribute values.
An example of interpolation is shown below:
@@ -40,7 +40,7 @@ a custom `toString()` function on the object, and uses that. Custom means that
Attributes such as `disabled` are called `boolean` attributes, because their presence means `true` and
their absence means `false`. We cannot use normal attribute bindings with them, because the HTML
specification does not require browsers to preserve the values of boolean attributes. This means that
-if we put an Angular interpolation expression into such an attribute then the binding information
+if we put an AngularJS interpolation expression into such an attribute then the binding information
would be lost, because the browser ignores the attribute value.
In the following example, the interpolation information would be ignored and the browser would simply
@@ -51,7 +51,7 @@ interpret the attribute as present, meaning that the button would always be disa
```
-For this reason, Angular provides special `ng`-prefixed directives for the following boolean attributes:
+For this reason, AngularJS provides special `ng`-prefixed directives for the following boolean attributes:
{@link ngDisabled `disabled`}, {@link ngRequired `required`}, {@link ngSelected `selected`},
{@link ngChecked `checked`}, {@link ngReadonly `readOnly`} , and {@link ngOpen `open`}.
@@ -75,7 +75,7 @@ For example, considering this template:
```
-We would expect Angular to be able to bind to this, but when we check the console we see
+We would expect AngularJS to be able to bind to this, but when we check the console we see
something like `Error: Invalid value for attribute cx="{{cx}}"`. Because of the SVG DOM API's
restrictions, you cannot simply write `cx="{{cx}}"`.
@@ -131,7 +131,7 @@ directive that changes the content of that attribute, such as `ngStyle`.
### Embedding interpolation markup inside expressions
-**Note:** Angular directive attributes take either expressions *or* interpolation markup with embedded expressions.
+**Note:** AngularJS directive attributes take either expressions *or* interpolation markup with embedded expressions.
It is considered **bad practice** to embed interpolation markup inside an expression:
@@ -165,4 +165,4 @@ If another directive accesses attribute data before interpolation has run, it wi
interpolation markup and not data.
- It impacts performance, as interpolation adds another watcher to the scope.
- Since this is not recommended usage, we do not test for this, and changes to
-Angular core may break your code.
+AngularJS core may break your code.
diff --git a/docs/content/guide/introduction.ngdoc b/docs/content/guide/introduction.ngdoc
index 0772ef851916..05704e5302f6 100644
--- a/docs/content/guide/introduction.ngdoc
+++ b/docs/content/guide/introduction.ngdoc
@@ -4,15 +4,15 @@
@description
-# What Is Angular?
+# What Is AngularJS?
AngularJS is a structural framework for dynamic web apps. It lets you use HTML as your template
language and lets you extend HTML's syntax to express your application's components clearly and
-succinctly. Angular's data binding and dependency injection eliminate much of the code you
+succinctly. AngularJS's data binding and dependency injection eliminate much of the code you
would otherwise have to write. And it all happens within the browser, making it
an ideal partner with any server technology.
-Angular is what HTML would have been, had it been designed for applications. HTML is a great
+AngularJS is what HTML would have been, had it been designed for applications. HTML is a great
declarative language for static documents. It does not contain much in the way of creating
applications, and as a result building web applications is an exercise in *what do I have to do
to trick the browser into doing what I want?*
@@ -26,8 +26,8 @@ The impedance mismatch between dynamic applications and static documents is ofte
app specific. E.g., `durandal`, `ember`, etc.
-Angular takes another approach. It attempts to minimize the impedance mismatch between document
-centric HTML and what an application needs by creating new HTML constructs. Angular teaches the
+AngularJS takes another approach. It attempts to minimize the impedance mismatch between document
+centric HTML and what an application needs by creating new HTML constructs. AngularJS teaches the
browser new syntax through a construct we call *directives*. Examples include:
* Data binding, as in `{{}}`.
@@ -40,11 +40,11 @@ browser new syntax through a construct we call *directives*. Examples include:
## A complete client-side solution
-Angular is not a single piece in the overall puzzle of building the client-side of a web
+AngularJS is not a single piece in the overall puzzle of building the client-side of a web
application. It handles all of the DOM and AJAX glue code you once wrote by hand and puts it in a
-well-defined structure. This makes Angular opinionated about how a CRUD (Create, Read, Update, Delete)
-application should be built. But while it is opinionated, it also tries to make sure that its opinion
-is just a starting point you can easily change. Angular comes with the following out-of-the-box:
+well-defined structure. This makes AngularJS opinionated about how a CRUD (Create, Read, Update, Delete)
+application should be built. But while it is opinionated, it also tries to make sure that its opinion
+is just a starting point you can easily change. AngularJS comes with the following out-of-the-box:
* Everything you need to build a CRUD app in a cohesive set: Data-binding, basic templating
directives, form validation, routing, deep-linking, reusable components and dependency injection.
@@ -52,21 +52,21 @@ is just a starting point you can easily change. Angular comes with the following
* Seed application with directory layout and test scripts as a starting point.
-## Angular's sweet spot
+## AngularJS's sweet spot
-Angular simplifies application development by presenting a higher level of abstraction to the
+AngularJS simplifies application development by presenting a higher level of abstraction to the
developer. Like any abstraction, it comes at a cost of flexibility. In other words, not every app
-is a good fit for Angular. Angular was built with the CRUD application in mind. Luckily CRUD
-applications represent the majority of web applications. To understand what Angular is
-good at, though, it helps to understand when an app is not a good fit for Angular.
+is a good fit for AngularJS. AngularJS was built with the CRUD application in mind. Luckily CRUD
+applications represent the majority of web applications. To understand what AngularJS is
+good at, though, it helps to understand when an app is not a good fit for AngularJS.
Games and GUI editors are examples of applications with intensive and tricky DOM manipulation.
-These kinds of apps are different from CRUD apps, and as a result are probably not a good fit for Angular.
+These kinds of apps are different from CRUD apps, and as a result are probably not a good fit for AngularJS.
In these cases it may be better to use a library with a lower level of abstraction, such as `jQuery`.
-# The Zen of Angular
+# The Zen of AngularJS
-Angular is built around the belief that declarative code is better than imperative when it comes
+AngularJS is built around the belief that declarative code is better than imperative when it comes
to building UIs and wiring software components together, while imperative code is excellent for
expressing business logic.
@@ -83,7 +83,7 @@ expressing business logic.
-Angular frees you from the following pains:
+AngularJS frees you from the following pains:
* **Registering callbacks:** Registering callbacks clutters your code, making it hard to see the
forest for the trees. Removing common boilerplate code such as callbacks is a good thing. It
@@ -92,16 +92,16 @@ Angular frees you from the following pains:
* **Manipulating HTML DOM programmatically:** Manipulating HTML DOM is a cornerstone of AJAX
applications, but it's cumbersome and error-prone. By declaratively describing how the UI
should change as your application state changes, you are freed from low-level DOM manipulation
- tasks. Most applications written with Angular never have to programmatically manipulate the
+ tasks. Most applications written with AngularJS never have to programmatically manipulate the
DOM, although you can if you want to.
* **Marshaling data to and from the UI:** CRUD operations make up the majority of AJAX
applications' tasks. The flow of marshaling data from the server to an internal object to an HTML
form, allowing users to modify the form, validating the form, displaying validation errors,
returning to an internal model, and then back to the server, creates a lot of boilerplate
- code. Angular eliminates almost all of this boilerplate, leaving code that describes the
+ code. AngularJS eliminates almost all of this boilerplate, leaving code that describes the
overall flow of the application rather than all of the implementation details.
* **Writing tons of initialization code just to get started:** Typically you need to write a lot
- of plumbing just to get a basic "Hello World" AJAX app working. With Angular you can bootstrap
+ of plumbing just to get a basic "Hello World" AJAX app working. With AngularJS you can bootstrap
your app easily using services, which are auto-injected into your application in a
[Guice](https://github.com/google/guice)-like dependency-injection style. This allows you
to get started developing features quickly. As a bonus, you get full control over the
diff --git a/docs/content/guide/migration.ngdoc b/docs/content/guide/migration.ngdoc
index faec2dedf32a..69f164bfaf70 100644
--- a/docs/content/guide/migration.ngdoc
+++ b/docs/content/guide/migration.ngdoc
@@ -33,7 +33,7 @@ which drives many of these changes.
## Migrating from 1.5 to 1.6
-Angular 1.6 fixes numerous bugs and adds new features, both in core and in external modules.
+AngularJS 1.6 fixes numerous bugs and adds new features, both in core and in external modules.
In addition, it includes several security and performance improvements in commonly used services,
such as `$compile`, `$injector`, `$parse`, `$animate`, and directives, such as `input`, `ngModel`
and `select`.
@@ -611,7 +611,7 @@ HTTP requests now update the outstanding request count synchronously. Previously
would not have been updated until the request to the server was actually in flight. Now the request
count is updated before any async interceptor is called.
-The new behavior will also allow end-2-end tests to more correctly detect when Angular is stable,
+The new behavior will also allow end-2-end tests to more correctly detect when AngularJS is stable,
but there is a chance it may change the observed behaviour in cases where an async request
interceptor is being used.
@@ -824,11 +824,11 @@ elem.data('foo-bar'); // 2
-When bootstrapping, first Angular applies all constant definitions.
-Then Angular applies configuration blocks in the same order they were registered.
+When bootstrapping, first AngularJS applies all constant definitions.
+Then AngularJS applies configuration blocks in the same order they were registered.
## Run Blocks
-Run blocks are the closest thing in Angular to the main method. A run block is the code which
+Run blocks are the closest thing in AngularJS to the main method. A run block is the code which
needs to run to kickstart the application. It is executed after all of the services have been
configured and the injector has been created. Run blocks typically contain code which is hard
to unit-test, and for this reason should be declared in isolated modules, so that they can be
@@ -213,7 +213,7 @@ modules require it.
Modules are a way of managing $injector configuration, and have nothing to do with loading of
scripts into a VM. There are existing projects which deal with script loading, which may be used
-with Angular. Because modules do nothing at load time they can be loaded into the VM in any order
+with AngularJS. Because modules do nothing at load time they can be loaded into the VM in any order
and thus script loaders can take advantage of this property and parallelize the loading process.
## Creation versus Retrieval
@@ -242,7 +242,7 @@ Small, structured modules help keep unit tests concise and focused.
Each module can only be loaded once per injector.
-Usually an Angular app has only one injector and modules are only loaded once.
+Usually an AngularJS app has only one injector and modules are only loaded once.
Each test has its own injector and modules are loaded multiple times.
diff --git a/docs/content/guide/production.ngdoc b/docs/content/guide/production.ngdoc
index 7b09d97e59cd..10621884bf39 100644
--- a/docs/content/guide/production.ngdoc
+++ b/docs/content/guide/production.ngdoc
@@ -78,13 +78,13 @@ For more information, see the
## Disable comment and css class directives
By default AngularJS compiles and executes all directives inside comments and element classes.
-In order to perform this task, angular compiler must look for directives by:
+In order to perform this task, the AngularJS compiler must look for directives by:
- Parse all your application element classes.
- Parse all your application html comments.
-Nowadays most of the Angular projects are using only element and attribute directives,
+Nowadays most of the AngularJS projects are using only element and attribute directives,
and in such projects there is no need to compile comments and classes.
If you are sure that your project only uses element and attribute directives,
diff --git a/docs/content/guide/providers.ngdoc b/docs/content/guide/providers.ngdoc
index 4e36ac266d21..e8c80025cff6 100644
--- a/docs/content/guide/providers.ngdoc
+++ b/docs/content/guide/providers.ngdoc
@@ -6,7 +6,7 @@
# Providers
Each web application you build is composed of objects that collaborate to get stuff done. These
-objects need to be instantiated and wired together for the app to work. In Angular apps most of
+objects need to be instantiated and wired together for the app to work. In AngularJS apps most of
these objects are instantiated and wired together automatically by the {@link auto.$injector
injector service}.
@@ -14,7 +14,7 @@ The injector creates two types of objects, **services** and **specialized object
Services are objects whose API is defined by the developer writing the service.
-Specialized objects conform to a specific Angular framework API. These objects are one of
+Specialized objects conform to a specific AngularJS framework API. These objects are one of
controllers, directives, filters or animations.
The injector needs to know how to create these objects. You tell it by registering a "recipe" for
@@ -35,11 +35,11 @@ In order for the injector to know how to create and wire together all of these o
a registry of "recipes". Each recipe has an identifier of the object and the description of how to
create this object.
-Each recipe belongs to an {@link angular.Module Angular module}. An Angular module is a bag
+Each recipe belongs to an {@link angular.Module AngularJS module}. An AngularJS module is a bag
that holds one or more recipes. And since manually keeping track of module dependencies is no fun,
a module can contain information about dependencies on other modules as well.
-When an Angular application starts with a given application module, Angular creates a new instance
+When an AngularJS application starts with a given application module, AngularJS creates a new instance
of injector, which in turn creates a registry of recipes as a union of all recipes defined in the
core "ng" module, application module and its dependencies. The injector then consults the recipe
registry when it needs to create an object for your application.
@@ -55,10 +55,10 @@ var myApp = angular.module('myApp', []);
myApp.value('clientId', 'a12345654321x');
```
-Notice how we created an Angular module called `myApp`, and specified that this module definition
+Notice how we created an AngularJS module called `myApp`, and specified that this module definition
contains a "recipe" for constructing the `clientId` service, which is a simple string in this case.
-And this is how you would display it via Angular's data-binding:
+And this is how you would display it via AngularJS's data-binding:
```javascript
@@ -95,7 +95,7 @@ The Factory recipe constructs a new service using a function with zero or more a
are dependencies on other services). The return value of this function is the service instance
created by this recipe.
-Note: All services in Angular are singletons. That means that the injector uses each recipe at most
+Note: All services in AngularJS are singletons. That means that the injector uses each recipe at most
once to create the object. The injector then caches the reference for all future needs.
Since a Factory is a more powerful version of the Value recipe, the same service can be constructed with it.
@@ -246,7 +246,7 @@ Notice that the unicorn provider is injected into the config function. This inje
provider injector which is different from the regular instance injector, in that it instantiates
and wires (injects) all provider instances only.
-During application bootstrap, before Angular goes off creating all services, it configures and
+During application bootstrap, before AngularJS goes off creating all services, it configures and
instantiates all providers. We call this the configuration phase of the application life-cycle.
During this phase, services aren't accessible because they haven't been created yet.
@@ -256,7 +256,7 @@ creating services starts. We call this part of the application life-cycle the ru
## Constant Recipe
-We've just learned how Angular splits the life-cycle into configuration phase and run phase and how
+We've just learned how AngularJS splits the life-cycle into configuration phase and run phase and how
you can provide configuration to your application via the config function. Since the config
function runs in the configuration phase when no services are available, it doesn't have access
even to simple value objects created via the Value recipe.
@@ -308,7 +308,7 @@ myApp.controller('DemoController', ["clientId", "planetName", function DemoContr
Earlier we mentioned that we also have special purpose objects that are different from services.
These objects extend the framework as plugins and therefore must implement interfaces specified by
-Angular. These interfaces are Controller, Directive, Filter and Animation.
+AngularJS. These interfaces are Controller, Directive, Filter and Animation.
The instructions for the injector to create these special objects (with the exception of the
Controller objects) use the Factory recipe behind the scenes.
@@ -340,7 +340,7 @@ We can then use the component like this:
```
-Using Factory recipes, you can also define Angular's filters and animations, but the controllers
+Using Factory recipes, you can also define AngularJS's filters and animations, but the controllers
are a bit special. You create a controller as a custom type that declares its dependencies as
arguments for its constructor function. This constructor is then registered with a module. Let's
take a look at the `DemoController`, created in one of the early examples:
diff --git a/docs/content/guide/scope.ngdoc b/docs/content/guide/scope.ngdoc
index 6c1606f85f28..3a4c2089275f 100644
--- a/docs/content/guide/scope.ngdoc
+++ b/docs/content/guide/scope.ngdoc
@@ -16,8 +16,8 @@ watch {@link guide/expression expressions} and propagate events.
model mutations.
- Scopes provide APIs ({@link ng.$rootScope.Scope#$apply $apply}) to
- propagate any model changes through the system into the view from outside of the "Angular
- realm" (controllers, services, Angular event handlers).
+ propagate any model changes through the system into the view from outside of the "AngularJS
+ realm" (controllers, services, AngularJS event handlers).
- Scopes can be nested to limit access to the properties of application components while providing
access to shared model properties. Nested scopes are either "child scopes" or "isolate scopes".
@@ -108,7 +108,7 @@ to test the behavior without being distracted by the rendering details.
## Scope Hierarchies
-Each Angular application has exactly one {@link ng.$rootScope root scope}, but
+Each AngularJS application has exactly one {@link ng.$rootScope root scope}, but
may have several child scopes.
The application can have multiple scopes, because some {@link guide/directive directives} create
@@ -116,7 +116,7 @@ new child scopes (refer to directive documentation to see which directives creat
When new scopes are created, they are added as children of their parent scope. This creates a tree
structure which parallels the DOM where they're attached.
-When Angular evaluates `{{name}}`, it first looks at the scope associated with the given
+When AngularJS evaluates `{{name}}`, it first looks at the scope associated with the given
element for the `name` property. If no such property is found, it searches the parent scope
and so on until the root scope is reached. In JavaScript this behavior is known as prototypical
inheritance, and child scopes prototypically inherit from their parents.
@@ -141,7 +141,7 @@ a diagram depicting the scope boundaries.
angular.module('scopeExample', [])
.controller('GreetController', ['$scope', '$rootScope', function($scope, $rootScope) {
$scope.name = 'World';
- $rootScope.department = 'Angular';
+ $rootScope.department = 'AngularJS';
}])
.controller('ListController', ['$scope', function($scope) {
$scope.names = ['Igor', 'Misko', 'Vojta'];
@@ -158,7 +158,7 @@ a diagram depicting the scope boundaries.
-Notice that Angular automatically places `ng-scope` class on elements where scopes are
+Notice that AngularJS automatically places `ng-scope` class on elements where scopes are
attached. The `