docs(changelog): release notes for 1.2.25

Fixes number formatting and symbols for many locales.
Adds support for additional locales.

.bowerrc

@@ -1,4 +0,0 @@
-{
-  "directory": "bower_components",
-  "json": "bower.json"
-}

.gitignore

@@ -9,8 +9,7 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 /node_modules/
-/components/
-/bower_components/
+bower_components/
 angular.xcodeproj
 .idea
 .agignore

CHANGELOG.md

@@ -1,3 +1,633 @@
+<a name="1.2.25"></a>
+# 1.2.25 hypnotic-gesticulation (2014-09-16)
+
+
+## Bug Fixes
+
+- **i18n:** fix typo at i18n generation code
+  ([1b6d74cc](https://github.com/angular/angular.js/commit/1b6d74cc9f7f7b7bd529abe6ce612de3ae661601))
+- **ngLocale:** Regenerate Locale Files
+  ([06c76694](https://github.com/angular/angular.js/commit/06c76694ac9b2280594712e6a4b46a1d5987d098))
+- **select:** update option labels when model changes
+  ([d89d59f4](https://github.com/angular/angular.js/commit/d89d59f453d4e28be4f595fea7e2c4ff2338351f),
+   [#9025](https://github.com/angular/angular.js/issues/9025))
+
+
+
+<a name="1.3.0-rc.2"></a>
+# 1.3.0-rc.2 tactile-perception (2014-09-16)
+
+
+## Bug Fixes
+
+- **$compile:** update `'@'`-bindings in controller when `bindToController` is `true`
+  ([e7ac08a0](https://github.com/angular/angular.js/commit/e7ac08a0619d2bdc91c125d341772b4fbc0d5a78),
+   [#9052](https://github.com/angular/angular.js/issues/9052), [#9077](https://github.com/angular/angular.js/issues/9077))
+- **$parse:** ensure CSP assignable expressions have `assign()`
+  ([d13b4bd1](https://github.com/angular/angular.js/commit/d13b4bd1f5f2abaad00f5d1bf81f79549a8d0e46),
+   [#9048](https://github.com/angular/angular.js/issues/9048))
+- **i18n:** fix typo at i18n generation code
+  ([eb4afd45](https://github.com/angular/angular.js/commit/eb4afd45f77d7d67744e01ce63a831c13c2b22e8))
+- **input:** always pass in the model value to `ctrl.$isEmpty`
+  ([3e51b84b](https://github.com/angular/angular.js/commit/3e51b84bc19f7e6acc61cb536ddcdbfed307c831),
+   [#5164](https://github.com/angular/angular.js/issues/5164), [#9017](https://github.com/angular/angular.js/issues/9017))
+- **jqLite:** fix `event.stopImmediatePropagation()` so it works as expected
+  ([30354c58](https://github.com/angular/angular.js/commit/30354c58fe2bd371df364f7a3f55b270692a4051),
+   [#4833](https://github.com/angular/angular.js/issues/4833))
+- **ngLocale:** Regenerate Locale Files
+  ([6a96a820](https://github.com/angular/angular.js/commit/6a96a8200aff4749bc84c44a1e8018b09d9ebdb4),
+   [#8931](https://github.com/angular/angular.js/issues/8931), [#8583](https://github.com/angular/angular.js/issues/8583), [#7799](https://github.com/angular/angular.js/issues/7799))
+- **ngModel:**
+  - do not reset bound date objects
+  ([1a1ef629](https://github.com/angular/angular.js/commit/1a1ef62903c8fdf4ceb81277d966a8eff67f0a96),
+   [#6666](https://github.com/angular/angular.js/issues/6666))
+  - don’t clear the model when an external validator failed
+  ([9314719d](https://github.com/angular/angular.js/commit/9314719d1eb5f480b877f5513f6e0e474edcb67d),
+   [#8357](https://github.com/angular/angular.js/issues/8357), [#8080](https://github.com/angular/angular.js/issues/8080))
+- **ngResource:** make badcfg error message more helpful
+  ([a3962f0d](https://github.com/angular/angular.js/commit/a3962f0df3f9b8382b47952f9e4fcb48a4cc098b),
+   [#9005](https://github.com/angular/angular.js/issues/9005), [#9010](https://github.com/angular/angular.js/issues/9010))
+- **select:** update option labels when model changes
+  ([46274102](https://github.com/angular/angular.js/commit/46274102454038ee7fd4543a32166e9bbbc98904),
+   [#9025](https://github.com/angular/angular.js/issues/9025))
+
+
+## Features
+
+- **limitTo:** support numeric input to limitTo
+  ([1c8a7459](https://github.com/angular/angular.js/commit/1c8a7459c90efc77b1a0987f976e3bddab4565fe),
+   [#8926](https://github.com/angular/angular.js/issues/8926))
+- **ngInclude:** add template url parameter to events
+  ([fd2d6c02](https://github.com/angular/angular.js/commit/fd2d6c02f9654e753d3655a3377a9534f7a54de3),
+   [#8453](https://github.com/angular/angular.js/issues/8453), [#8454](https://github.com/angular/angular.js/issues/8454))
+
+
+## Performance Improvements
+
+- **$compile:** move `$$isolateBinding` creation to directive factory instead of on each link
+  ([56f09f0b](https://github.com/angular/angular.js/commit/56f09f0b44048b62f964d29db4d3d2630662f6ea))
+- **$parse:**
+  - execute watched expressions only when the inputs change
+  ([fca6be71](https://github.com/angular/angular.js/commit/fca6be71274e537c7df86ae9e27a3bd1597e9ffa),
+   [#9006](https://github.com/angular/angular.js/issues/9006), [#9082](https://github.com/angular/angular.js/issues/9082))
+  - remove `binaryFn` and `valueFn` wrappers from filter expressions
+  ([67919c80](https://github.com/angular/angular.js/commit/67919c808771a9b185a9d552cd32a90748d36666))
+
+
+## Breaking Changes
+
+- **$parse:** due to [fca6be71](https://github.com/angular/angular.js/commit/fca6be71274e537c7df86ae9e27a3bd1597e9ffa),
+  all filters are assumed to be stateless functions
+
+Previously it was just a good practice to make all filters stateless. Now
+it's a requirement in order for the model change-observation to pick up
+all changes.
+
+If an existing filter is statefull, it can be flagged as such but keep in
+mind that this will result in a significant performance-penalty (or rather
+lost opportunity to benefit from a major perf improvement) that will
+affect the `$digest` duration.
+
+To flag a filter as stateful do the following:
+
+```javascript
+myApp.filter('myFilter', function() {
+  function myFilter(input) { ... };
+  myFilter.$stateful = true;
+  return myFilter;
+});
+```
+
+
+
+<a name="1.3.0-rc.1"></a>
+# 1.3.0-rc.1 backyard-atomicity (2014-09-09)
+
+
+## Bug Fixes
+
+- **$location:**
+  - don't call toString on null values
+  ([c3a58a9f](https://github.com/angular/angular.js/commit/c3a58a9f34919f121587540e03ecbd51b25198d4))
+  - remove an unused parameter of $location.url
+  ([99d95f16](https://github.com/angular/angular.js/commit/99d95f1639b64c39231448d77209676b54e6f0be))
+  - allow numeric location setter arguments
+  ([adb5c6d6](https://github.com/angular/angular.js/commit/adb5c6d6cc76b928436743707727ab0974d6810b),
+   [#7054](https://github.com/angular/angular.js/issues/7054))
+  - set `baseHref` in mock browser to `/`
+  ([fc706d13](https://github.com/angular/angular.js/commit/fc706d13d80bb40eb3dade58ea4b92dca33ce4e7),
+   [#8866](https://github.com/angular/angular.js/issues/8866), [#8889](https://github.com/angular/angular.js/issues/8889))
+- **$parse:** disallow passing Function to Array.sort
+  ([bd8ad0fb](https://github.com/angular/angular.js/commit/bd8ad0fbe81f6c280baa26a596d78e58fc7842e6))
+- **input:** check `scope.$$phase` only on `$rootScope`
+  ([bf59d727](https://github.com/angular/angular.js/commit/bf59d7274f4a667c5b19e6d4ba5ed2730ca2fe42))
+- **ngAnimate:** support removing classes from SVG elements when using jQuery
+  ([b3b67213](https://github.com/angular/angular.js/commit/b3b672130d4d1c6f13bdf7e58be76b2aafea2497),
+   [#8872](https://github.com/angular/angular.js/issues/8872), [#8893](https://github.com/angular/angular.js/issues/8893))
+- **ngEventDirs:** check `scope.$$phase` only on `$rootScope`
+  ([203ea10f](https://github.com/angular/angular.js/commit/203ea10f9ea49d7e29569a4232d3b2a666307cd8),
+   [#8891](https://github.com/angular/angular.js/issues/8891))
+- **ngForm:** don't clear validity of whole form when removing control
+  ([953ee22f](https://github.com/angular/angular.js/commit/953ee22f76f8c1137949ed07f36fafc5bbfeb7fe),
+   [#8863](https://github.com/angular/angular.js/issues/8863))
+- **ngInclude:** correctly add svg-namespaced template content
+  ([6639ca9d](https://github.com/angular/angular.js/commit/6639ca9d6bc00a6e3a31e54c50474361ae3561c6),
+   [#7538](https://github.com/angular/angular.js/issues/7538), [#8981](https://github.com/angular/angular.js/issues/8981), [#8997](https://github.com/angular/angular.js/issues/8997))
+- **ngModel:**
+  - update model value with async validators correctly
+  ([64c3b745](https://github.com/angular/angular.js/commit/64c3b745fba0792166f30e057f9251f263d80dac))
+  - render immediately also with async validators
+  ([f94d5515](https://github.com/angular/angular.js/commit/f94d551529b7c970c38b29e3073cec4e7f6b0e00))
+  - properly parse min/max date values as strings for date inputs
+  ([088545c1](https://github.com/angular/angular.js/commit/088545c1856ce1c3ec3416965dff65077a6e0523),
+   [#6755](https://github.com/angular/angular.js/issues/6755))
+  - revalidate the model when min/max expression values change for date inputs
+  ([b3502835](https://github.com/angular/angular.js/commit/b3502835039178296b730b7526e5666b66ba9156),
+   [#6755](https://github.com/angular/angular.js/issues/6755))
+  - consider ngMin/ngMax values when validating number input types
+  ([25541c1f](https://github.com/angular/angular.js/commit/25541c1f876a16c892d71faae11727bec7bba98c))
+  - revalidate the model when min/max expression values change for number inputs
+  ([7b273a2c](https://github.com/angular/angular.js/commit/7b273a2c978d5f5ef374f5335afab0ca7d8cfd4d),
+   [#2404](https://github.com/angular/angular.js/issues/2404))
+- **ngModelOptions:** do not trigger digest on `setViewValue` if debouncing
+  ([e322cd9b](https://github.com/angular/angular.js/commit/e322cd9b3b8b47b95c9de3edf631bb46f919c492),
+   [#8814](https://github.com/angular/angular.js/issues/8814), [#8850](https://github.com/angular/angular.js/issues/8850), [#8911](https://github.com/angular/angular.js/issues/8911))
+- **ngRepeat:** preserve original position of elements that are being animated away
+  ([ed637330](https://github.com/angular/angular.js/commit/ed6373300028deda9a0878b3975699d183c1f75c),
+   [#8918](https://github.com/angular/angular.js/issues/8918), [#8994](https://github.com/angular/angular.js/issues/8994))
+- **ngSwitch:** ensure correct iterator is passed to async function
+  ([712299c2](https://github.com/angular/angular.js/commit/712299c2a24390e74cd5c20f51cb1d78f0233b6f),
+   [#8833](https://github.com/angular/angular.js/issues/8833))
+- **numberFilter:** format numbers that round to zero as nonnegative
+  ([ae952fbf](https://github.com/angular/angular.js/commit/ae952fbf0be925a48743d1c925ffe4e31a42c280),
+   [#8489](https://github.com/angular/angular.js/issues/8489))
+- **orderBy:** allow arrayLike objects to be ordered
+  ([cbdaabfb](https://github.com/angular/angular.js/commit/cbdaabfb59bf3348588d5b581f2754e0f9f034a4),
+   [#8944](https://github.com/angular/angular.js/issues/8944))
+
+
+## Features
+
+- **angular.forEach:** add the array/object as the 3rd param like the native array forEach
+  ([df9e60c8](https://github.com/angular/angular.js/commit/df9e60c8e7453cdca2cb5a4fa48f3981ecc23a7d),
+   [#7902](https://github.com/angular/angular.js/issues/7902))
+- **ngModelOptions:** add allowInvalid option
+  ([3c538c1d](https://github.com/angular/angular.js/commit/3c538c1d21c43422c7b4cd9b69cb67981bce2b87),
+   [#8290](https://github.com/angular/angular.js/issues/8290), [#8313](https://github.com/angular/angular.js/issues/8313))
+
+
+## Performance Improvements
+
+- **$parse:**
+  - remove getterFn wrapper for internal use
+  ([b3b476db](https://github.com/angular/angular.js/commit/b3b476db7d34bc2f8b099ab5b993b1e899b9cffd),
+   [#8901](https://github.com/angular/angular.js/issues/8901))
+  - removing references to Parser/Lexer from parsed expressions
+  ([43c67ccd](https://github.com/angular/angular.js/commit/43c67ccd167aecc3549e1b7f7d100956204e3ed4))
+  - calculate array lengths once at start of loop
+  ([907b8c16](https://github.com/angular/angular.js/commit/907b8c1675865ac38dd055f3f304272e68b233d0))
+- **extend:** remove use of forEach to remove calls/closures/passing arguments
+  ([9bedeb33](https://github.com/angular/angular.js/commit/9bedeb3353969fba631ad9164edea3c38059fbda),
+   [#8898](https://github.com/angular/angular.js/issues/8898))
+- **jQuery:** only trigger $destroy if a handler exists
+  ([f6aa1c55](https://github.com/angular/angular.js/commit/f6aa1c55616b34215f562e0445e436210860ef04),
+   [#8859](https://github.com/angular/angular.js/issues/8859))
+
+
+## Breaking Changes
+
+- **ngModelController,formController:** due to [6046e14b](https://github.com/angular/angular.js/commit/6046e14bd22491168116e61ffdf5fd3fed5f135c),
+
+- `ctrl.$error` no longer contains entries for validators that were
+  successful.
+- `ctrl.$setValidity` now differentiates between `true`, `false`,
+  `undefined` and `null`, instead of previously only truthy vs falsy.
+
+Closes #8941- **ngSwitch:** due to [0f806d96](https://github.com/angular/angular.js/commit/0f806d9659b5b89a4bd9493364bc36398677e939),
+
+
+Ever since 0df93fd, tagged in v1.0.0rc1, the ngSwitch directive has had an undocumented `change`
+attribute, used for evaluating a scope expression when the switch value changes.
+
+While it's unlikely, applications which may be using this feature should work around the removal
+by adding a custom directive which will perform the eval instead. Directive controllers are
+re-instantiated when being transcluded, so by putting the attribute on each item that you want
+to be notified of a change to, you can more or less emulate the old behaviour.
+
+Example:
+
+```js
+angular.module("switchChangeWorkaround", []).
+  directive("onSwitchChanged", function() {
+    return {
+      link: function($scope, $element, $attrs) {
+        $scope.$parent.$eval($attrs.onSwitchChanged);
+      }
+    };
+  });
+```
+
+```html
+<div ng-switch="switcher">
+  <div ng-switch-when="a" on-switch-changed="doSomethingInParentScope()"></div>
+  <div ng-switch-when="b" on-switch-changed="doSomethingInParentScope()"></div>
+</div>
+```
+
+Closes #8858
+Closes #8822
+
+
+<a name="1.2.24"></a>
+# 1.2.24 static-levitation (2014-09-09)
+
+
+## Bug Fixes
+
+- **$browser:** detect changes to the browser url that happened in sync
+  ([2ece4d03](https://github.com/angular/angular.js/commit/2ece4d0347a8a18d4d35993bb882ed6b5b24266c),
+   [#6976](https://github.com/angular/angular.js/issues/6976))
+- **$compile:**
+  - render nested transclusion at the root of a template
+  ([9d9cdfb5](https://github.com/angular/angular.js/commit/9d9cdfb575b89e96ae957c986734a49995e2b511),
+   [#8914](https://github.com/angular/angular.js/issues/8914), [#8925](https://github.com/angular/angular.js/issues/8925))
+  - render nested transclusion at the root of a template
+  ([466320f6](https://github.com/angular/angular.js/commit/466320f6911698048bae5406e341d25af7efafa0),
+   [#8914](https://github.com/angular/angular.js/issues/8914), [#8925](https://github.com/angular/angular.js/issues/8925))
+- **$location:**
+  - don't call toString on null values
+  ([c12e8d46](https://github.com/angular/angular.js/commit/c12e8d4665b635ba6b09d12802efb88d38b7ad5c))
+  - remove an unused parameter of $location.url
+  ([c65796d4](https://github.com/angular/angular.js/commit/c65796d496038554861e70da8012f9d0e2521e6d))
+  - allow numeric location setter arguments
+  ([68a09ba7](https://github.com/angular/angular.js/commit/68a09ba74d10a1490feca1d248f85b0023aa399b),
+   [#7054](https://github.com/angular/angular.js/issues/7054))
+- **$parse:** disallow passing Function to Array.sort
+  ([b39e1d47](https://github.com/angular/angular.js/commit/b39e1d47b9a1b39a9fe34c847a81f589fba522f8))
+- **form:** ensure concurrent animations use setClass
+  ([d7548fdf](https://github.com/angular/angular.js/commit/d7548fdf1ce6f543bf55d330985a83ef09d0cb83),
+   [#8166](https://github.com/angular/angular.js/issues/8166))
+- **input:** check `scope.$$phase` only on `$rootScope`
+  ([36e6de1d](https://github.com/angular/angular.js/commit/36e6de1d91937d73e900ac115ae366fbefcdf6da))
+- **ngEventDirs:**
+  - check `scope.$$phase` only on `$rootScope`
+  ([2712c2f1](https://github.com/angular/angular.js/commit/2712c2f1979db23eeb53be8a519b9f79bd75e217),
+   [#8891](https://github.com/angular/angular.js/issues/8891))
+  - execute `blur` and `focus` expression using `scope.$evalAsync`
+  ([54f0bc0f](https://github.com/angular/angular.js/commit/54f0bc0fe0c6b6d974d23f2c5ef07359dd93eb99),
+   [#4979](https://github.com/angular/angular.js/issues/4979), [#5945](https://github.com/angular/angular.js/issues/5945), [#8803](https://github.com/angular/angular.js/issues/8803), [#6910](https://github.com/angular/angular.js/issues/6910), [#5402](https://github.com/angular/angular.js/issues/5402))
+- **ngRepeat:** improve errors for duplicate items
+  ([1812af58](https://github.com/angular/angular.js/commit/1812af58c2d470d586c2a543c9a7db3f0baca04f))
+- **numberFilter:** format numbers that round to zero as nonnegative
+  ([7e02fa07](https://github.com/angular/angular.js/commit/7e02fa07eb5b02e75b1db0058d638af3d1074942),
+   [#8489](https://github.com/angular/angular.js/issues/8489))
+- **orderBy:** allow arrayLike objects to be ordered
+  ([94b0f2d3](https://github.com/angular/angular.js/commit/94b0f2d35de601ded3d93ea4fa78a4d9b139c0a0),
+   [#8944](https://github.com/angular/angular.js/issues/8944))
+
+
+## Breaking Changes
+
+- **ngEventDirs:** due to [54f0bc0f](https://github.com/angular/angular.js/commit/54f0bc0fe0c6b6d974d23f2c5ef07359dd93eb99),
+
+The `blur` and `focus` event fire synchronously, also during DOM operations
+that remove elements. This lead to errors as the Angular model was not
+in a consistent state. See this [fiddle](http://jsfiddle.net/fq1dq5yb/) for a demo.
+
+This change executes the expression of those events using
+`scope.$evalAsync` if an `$apply` is in progress, otherwise
+keeps the old behavior.
+
+Fixes #4979
+Fixes #5945
+Closes #8803
+Closes #6910
+Closes #5402
+
+
+
+
+<a name="1.3.0-RC.0"></a>
+# 1.3.0-RC.0 sonic-boltification (2014-08-29)
+
+
+## Bug Fixes
+
+- **$animate:**
+  - wait two until two digests are over until enabling animations
+  ([92576743](https://github.com/angular/angular.js/commit/92576743eec0cef5ffdd701b83f72a61e6489c3b),
+   [#8844](https://github.com/angular/angular.js/issues/8844))
+  - ensure guarded animations consider AJAX requests upon bootstrap
+  ([4bca4c44](https://github.com/angular/angular.js/commit/4bca4c44b95a7435722605a750804043f2960160),
+   [#8275](https://github.com/angular/angular.js/issues/8275), [#5262](https://github.com/angular/angular.js/issues/5262))
+  - use $timeout to handle the delay within staggering animations
+  ([23da6140](https://github.com/angular/angular.js/commit/23da614043fe5dcf0be132b86466eecb11c766a2),
+   [#7228](https://github.com/angular/angular.js/issues/7228), [#7547](https://github.com/angular/angular.js/issues/7547), [#8297](https://github.com/angular/angular.js/issues/8297), [#8547](https://github.com/angular/angular.js/issues/8547))
+- **$browser:** detect changes to the browser url that happened in sync
+  ([3be00df4](https://github.com/angular/angular.js/commit/3be00df495f6eed3b3d9587ebab1fdd633e94e08),
+   [#6976](https://github.com/angular/angular.js/issues/6976))
+- **$compile:** use the correct namespace for transcluded svg elements
+  ([cb73a37c](https://github.com/angular/angular.js/commit/cb73a37c7cae5cdebadf7b3ddd44c5a452495e4e),
+   [#8808](https://github.com/angular/angular.js/issues/8808), [#8816](https://github.com/angular/angular.js/issues/8816))
+- **$location:** always resolve relative links in html5mode to `<base>` url
+  ([22948807](https://github.com/angular/angular.js/commit/22948807e324eb0b182b15b31045dc306a9f3231),
+   [#8492](https://github.com/angular/angular.js/issues/8492), [#8172](https://github.com/angular/angular.js/issues/8172))
+- **$parse:** properly handle dots at the end of identifiers
+  ([8ac90357](https://github.com/angular/angular.js/commit/8ac90357a66ae0c62dbfe6db2c6eaf1d600ecc65),
+   [#4613](https://github.com/angular/angular.js/issues/4613), [#4912](https://github.com/angular/angular.js/issues/4912), [#8559](https://github.com/angular/angular.js/issues/8559))
+- **Angular:** remove duplicate nodeName_ references
+  ([a4520a74](https://github.com/angular/angular.js/commit/a4520a745d917c77f1d12cdbce48272c643f7255))
+- **currencyFilter:** pass through null and undefined values
+  ([c2aaddbe](https://github.com/angular/angular.js/commit/c2aaddbe4b21348aab8c13a78cdd6aaee846ae4e),
+   [#8605](https://github.com/angular/angular.js/issues/8605))
+- **docs:** don't throw exception on the 404 page
+  ([550ba01b](https://github.com/angular/angular.js/commit/550ba01b325fc29460030fc9c24fa00269dec2a9),
+   [#8518](https://github.com/angular/angular.js/issues/8518))
+- **input:**
+  - validate minlength/maxlength for non-string values
+  ([77ce5b89](https://github.com/angular/angular.js/commit/77ce5b89f97aa83c3eb1fe2e19375ef00a822015),
+   [#7967](https://github.com/angular/angular.js/issues/7967), [#8811](https://github.com/angular/angular.js/issues/8811))
+  - allow to use seconds in `input[time]` and `input[datetime-local]`
+  ([5f90340a](https://github.com/angular/angular.js/commit/5f90340abb78aa08dde4876328bcc00e46232e46))
+  - use year 1970 instead of 1900 for `input[time]`
+  ([29f0b568](https://github.com/angular/angular.js/commit/29f0b568debab7810752969d363d337099e96cdc))
+- **ngBindHtml:** throw error if interpolation is used in expression
+  ([cd21602d](https://github.com/angular/angular.js/commit/cd21602d5b1650d8be373618cb7320d697e32c4d),
+   [#8824](https://github.com/angular/angular.js/issues/8824))
+- **ngEventDirs:** execute `blur` and `focus` expression using `scope.$evalAsync`
+  ([719c747c](https://github.com/angular/angular.js/commit/719c747cd892ee933e7e414a7dc97e657b88317d),
+   [#4979](https://github.com/angular/angular.js/issues/4979), [#5945](https://github.com/angular/angular.js/issues/5945), [#8803](https://github.com/angular/angular.js/issues/8803), [#6910](https://github.com/angular/angular.js/issues/6910), [#5402](https://github.com/angular/angular.js/issues/5402))
+- **ngModel:**
+  - always format the viewValue as a string for text, url and email types
+  ([1eda1836](https://github.com/angular/angular.js/commit/1eda18365a348c9597aafba9d195d345e4f13d1e))
+  - allow non-assignable binding when getterSetter is used
+  ([ab878a6c](https://github.com/angular/angular.js/commit/ab878a6c038f47b95f3a7e85a4fdb599e0c73e63),
+   [#8704](https://github.com/angular/angular.js/issues/8704))
+  - treat undefined parse responses as parse errors
+  ([db044c40](https://github.com/angular/angular.js/commit/db044c408a7f8082758b96ab739348810c36e15a))
+- **ngRepeat:** improve errors for duplicate items
+  ([0604bb7b](https://github.com/angular/angular.js/commit/0604bb7b7a6156e33679396e805e327662d9a178))
+- **ngSwitch:** avoid removing DOM nodes twice within watch operation
+  ([c9b0bfec](https://github.com/angular/angular.js/commit/c9b0bfecc99837af1c97792b3ca3408ba182b0bb),
+   [#8662](https://github.com/angular/angular.js/issues/8662))
+- **numberFilter:** pass through null and undefined values
+  ([2ae10f67](https://github.com/angular/angular.js/commit/2ae10f67fcde3e172f695956301ef796b68a50c2),
+   [#8605](https://github.com/angular/angular.js/issues/8605), [#8842](https://github.com/angular/angular.js/issues/8842))
+
+
+## Features
+
+- **core:**
+  - add angular.reloadWithDebugInfo()
+  ([41c1b88](https://github.com/angular/angular.js/commit/41c1b8858f02c7310bfabdd545ebb28e90eb4258))
+- **$animate:**
+  - use promises instead of callbacks for animations
+  ([bf0f5502](https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9))
+  - coalesce concurrent class-based animations within a digest loop
+  ([2f4437b3](https://github.com/angular/angular.js/commit/2f4437b3a149eafb899f25933bd6c713b167d10e))
+- **$compile:**
+  - bind isolate scope properties to controller
+  ([5f3f25a1](https://github.com/angular/angular.js/commit/5f3f25a1a6f9d4f2a66e2700df3b9c5606f1c255),
+   [#7635](https://github.com/angular/angular.js/issues/7635), [#7645](https://github.com/angular/angular.js/issues/7645))
+  - allow disabling scope info
+  ([a1e5cd5f](https://github.com/angular/angular.js/commit/a1e5cd5fe3906ebee8c400247a1f793d3e2239fb))
+- **$compile/ngBind:** allow disabling binding info
+  ([3660fd09](https://github.com/angular/angular.js/commit/3660fd0912d3ccf6def8c9f02d8d4c0621c8d91f))
+- **$http:** implement mechanism for coalescing calls to $apply in $http
+  ([ea6fc6e6](https://github.com/angular/angular.js/commit/ea6fc6e69c2a2aa213c71ed4e917a0d54d064e4c),
+   [#8736](https://github.com/angular/angular.js/issues/8736), [#7634](https://github.com/angular/angular.js/issues/7634), [#5297](https://github.com/angular/angular.js/issues/5297))
+- **$rootScope:** implement $applyAsync to support combining calls to $apply into a single digest.
+  ([e94d454b](https://github.com/angular/angular.js/commit/e94d454b840f6cc55a440741382b407836ad245b))
+- **$templateRequest:** introduce the $templateRequest service
+  ([a70e2833](https://github.com/angular/angular.js/commit/a70e2833ea276107b11aafea96ef4a6724ad4d83))
+- **filter:** allow to define the timezone for formatting dates
+  ([4739b1d9](https://github.com/angular/angular.js/commit/4739b1d9daebfd094b6181c5f2cb52ff71e31c61))
+- **filterFilter:** pass index to function predicate
+  ([46343c60](https://github.com/angular/angular.js/commit/46343c603db6192daf5303b92eb664749326c7e6),
+   [#654](https://github.com/angular/angular.js/issues/654))
+- **input:** allow to define the timezone for parsing dates
+  ([cc6fc199](https://github.com/angular/angular.js/commit/cc6fc199f5abaacdf781aa03634337d776eb0fc9),
+   [#8447](https://github.com/angular/angular.js/issues/8447))
+- **minErr:** allow specifying ErrorConstructor in minErr constructor
+  ([a6bd4bc8](https://github.com/angular/angular.js/commit/a6bd4bc866a18f860c7548fa1b3f6d4c2a953416))
+- **ngModel:** provide validation API functions for sync and async validations
+  ([2ae4f40b](https://github.com/angular/angular.js/commit/2ae4f40be1803d999ca2a8cc30ec17ff19ea6d86))
+- **ngRoute:** alias string as redirectTo property in .otherwise()
+  ([3b5d75c0](https://github.com/angular/angular.js/commit/3b5d75c021e21fa6ec4dc6c47b8eafa55680ea63),
+   [#7794](https://github.com/angular/angular.js/issues/7794))
+- **testability:** add $$testability service
+  ([85880a64](https://github.com/angular/angular.js/commit/85880a64900fa22a61feb926bf52de0965332ca5))
+
+
+## Performance Improvements
+
+- **$compile:**
+  - add debug classes in compile phase
+  ([e0489abd](https://github.com/angular/angular.js/commit/e0489abd8d9e4971ae23cc38805a92d227d1f3a1))
+  - only iterate over elements with link functions
+  ([fdf9989f](https://github.com/angular/angular.js/commit/fdf9989f7cf1ed81982a788b75a338ac33334571),
+   [#8741](https://github.com/angular/angular.js/issues/8741))
+- **nodeName_:** simplify the code and reduce the number of DOM calls
+  ([5a1a0c96](https://github.com/angular/angular.js/commit/5a1a0c96220101b5e040f0755e5eb401e2c73f65))
+- **select:** execute render after $digest cycle
+  ([6f7018d5](https://github.com/angular/angular.js/commit/6f7018d52fa4f9f9c7fa8e3035317d1239efb20f),
+   [#8825](https://github.com/angular/angular.js/issues/8825))
+
+
+## Breaking Changes
+
+- **$location**: due to [22948807](https://github.com/angular/angular.js/commit/22948807e324eb0b182b15b31045dc306a9f3231)
+
+#### since 1.2.0 and 1.3.0-beta.1
+
+Angular now requires a `<base>` tag when html5 mode of `$location` is enabled. Reasoning:
+Using html5 mode without a `<base href="...">` tag makes relative links for images, links, ...
+relative to the current url if the browser supports
+the history API. However, if the browser does not support the history API Angular falls back to using the `#`,
+and then all those relative links would be broken.
+
+The `<base>` tag is also needed when a deep url is loaded from the server, e.g. `http://server/some/page/url`.
+In that case, Angular needs to decide which part of the url is the base of the application, and which part
+is path inside of the application.
+
+To summarize: Now all relative links are always relative to the `<base>` tag.
+
+Exception (also a breaking change):
+Link tags whose `href` attribute starts with a `#` will only change the hash of the url, but nothing else
+(e.g. `<a href="#someAnchor">`). This is to make it easy to scroll to anchors inside a document.
+
+Related to #6162
+Closes #8492
+
+#### since 1.2.17 and 1.3.0-beta.10
+
+In html5 mode without a `<base>` tag on older browser that don't support the history API
+relative paths were adding up. E.g. clicking on `<a href="page1">` and then on `<a href="page2">`
+would produce `$location.path()==='/page1/page2'`. The code that introduced this behavior was removed
+and Angular now also requires a `<base>` tag to be present when using html5 mode.
+
+Closes #8172, #8233
+
+
+- **ngInclude, ngMessage, ngView and directives that load templates**: due to [a70e2833](https://github.com/angular/angular.js/commit/a70e2833ea276107b11aafea96ef4a6724ad4d83)
+
+Angular will now throw a $compile minErr each a template fails to download
+for ngView, directives and ngMessage template requests. This changes the former
+behavior of silently ignoring failed HTTP requests--or when the template itself
+is empty. Please ensure that all directive, ngView and ngMessage code now properly
+addresses this scenario. NgInclude is uneffected from this change.
+
+
+- **$animate**: due to [23da6140](https://github.com/angular/angular.js/commit/23da614043fe5dcf0be132b86466eecb11c766a2)
+
+If any stagger code consisted of having BOTH transition staggers and delay staggers
+together then that will not work the same way. Angular will now instead choose
+the highest stagger delay value and set the timeout to wait for that before
+applying the active CSS class.
+
+
+- **$animate**: due to [bf0f5502](https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9)
+
+Both the API for the cancallation method and the done callback for
+$animate animations is different. Instead of using a callback function
+for each of the $animate animation methods, a promise is used instead.
+
+```js
+//before
+$animate.enter(element, container, null, callbackFn);
+
+//after
+$animate.enter(element, container).then(callbackFn);
+```
+
+The animation can now be cancelled via `$animate.cancel(promise)`.
+
+```js
+//before
+var cancelFn = $animate.enter(element, container);
+cancelFn(); //cancels the animation
+
+//after
+var promise = $animate.enter(element, container);
+$animate.cancel(promise); //cancels the animation
+```
+
+keep in mind that you will still need to run $scope.$apply inside of the `then` callback
+to trigger a digest.
+
+
+- **$animate**: due to [2f4437b3](https://github.com/angular/angular.js/commit/2f4437b3a149eafb899f25933bd6c713b167d10e)
+
+$animate.addClass, $animate.removeClass and $animate.setClass will no longer start the animation
+right after being called in the directive code. The animation will only commence once a digest
+has passed. This means that all animation-related testing code requires an extra digest to kick
+off the animation.
+
+```js
+//before this fix
+$animate.addClass(element, 'super');
+expect(element).toHaveClass('super');
+
+//now
+$animate.addClass(element, 'super');
+$rootScope.$digest();
+expect(element).toHaveClass('super');
+```
+
+$animate will also tally the amount of times classes are added and removed and only animate
+the left over classes once the digest kicks in. This means that for any directive code that
+adds and removes the same CSS class on the same element then this may result in no animation
+being triggered at all.
+
+```js
+$animate.addClass(element, 'klass');
+$animate.removeClass(element, 'klass');
+
+$rootScope.$digest();
+
+//nothing happens...
+```
+
+
+- **$compile/ngBind:** due to [3660fd09](https://github.com/angular/angular.js/commit/3660fd0912d3ccf6def8c9f02d8d4c0621c8d91f),
+
+The value of `$binding` data property on an element is always an array now
+and the expressions do not include the curly braces `{{ ... }}`.
+
+
+- **currencyFilter:** due to [c2aaddbe](https://github.com/angular/angular.js/commit/c2aaddbe4b21348aab8c13a78cdd6aaee846ae4e),
+  previously the currency filter would convert null and undefined values into empty string, after this change
+these values will be passed through.
+
+Only cases when the currency filter is chained with another filter that doesn't expect null/undefined will be affected. This
+should be very rare.
+
+This change will not change the visual output of the filter because the interpolation will convert the null/undefined to
+an empty string.
+
+Closes #8605
+
+
+- **numberFilter:** due to [2ae10f67](https://github.com/angular/angular.js/commit/2ae10f67fcde3e172f695956301ef796b68a50c2),
+  previously the number filter would convert null and undefined values into empty string, after this change
+these values will be passed through.
+
+Only cases when the number filter is chained with another filter that doesn't expect null/undefined will be affected. This
+should be very rare.
+
+This change will not change the visual output of the filter because the interpolation will convert the null/undefined to
+an empty string.
+
+Closes #8605
+Closes #8842
+
+
+- **input:**
+  - due to [77ce5b89](https://github.com/angular/angular.js/commit/77ce5b89f97aa83c3eb1fe2e19375ef00a822015),
+
+NgModel.viewValue will always be used when rendering validations for `minlength` and `maxlength`.
+
+Closes #7967
+Closes #8811
+
+- **input:**
+  - due to [29f0b568](https://github.com/angular/angular.js/commit/29f0b568debab7810752969d363d337099e96cdc),
+
+
+According to the HTML5 spec `input[time]` should create dates
+based on the year 1970 (used to be based on the year 1900).
+
+Related to #8447.
+
+
+- **ngModel**: due to [db044c40](https://github.com/angular/angular.js/commit/db044c408a7f8082758b96ab739348810c36e15a)
+
+Any parser code from before that returned an `undefined` value
+(or nothing at all) will now cause a parser failure. When this occurs
+none of the validators present in `$validators` will run until the parser
+error is gone. The error will be stored on `ngModel.$error`.
+
+
+
+
+- **ngEventDirs:** due to [719c747c](https://github.com/angular/angular.js/commit/719c747cd892ee933e7e414a7dc97e657b88317d),
+
+The `blur` and `focus` event fire synchronously, also during DOM operations
+that remove elements. This lead to errors as the Angular model was not
+in a consistent state. See this [fiddle](http://jsfiddle.net/fq1dq5yb/) for a demo.
+
+This change executes the expression of those events using
+`scope.$evalAsync` if an `$apply` is in progress, otherwise
+keeps the old behavior.
+
+Fixes #4979
+Fixes #5945
+Closes #8803
+Closes #6910
+Closes #5402
+
+
+
 <a name="1.2.23"></a>
 # 1.2.23 superficial-malady (2014-08-22)
 
@@ -1668,6 +2298,13 @@ jQuery. We don't expect that app code actually depends on this accidental featur
     application if 100s of elements are being inserted into the page. Therefore after this
     change callbacks are only fired if registered on the element being animated.
 
+- **input:**
+  - due to [a9fcb0d0](https://github.com/angular/angular.js/commit/a9fcb0d0fc6456f80501b8820d02b04d7c15b6d6),
+    input[type=file] will no longer support ngModel. Due to browser support being spotty among target browsers,
+    file inputs cannot be cleanly supported, and even features which technically do work (such as ng-change)
+    work in an inconsistent way depending on the attributes of the form control.
+
+    As a workaround, one can manually listen for change events on file inputs and handle them manually.
 
 <a name="1.2.12"></a>
 # 1.2.12 cauliflower-eradication (2014-02-07)

README.md

@@ -15,7 +15,7 @@ it makes development fun!
 * Tutorial: http://docs.angularjs.org/tutorial
 * API Docs: http://docs.angularjs.org/api
 * Developer Guide: http://docs.angularjs.org/guide
-* Contribution guidelines: http://docs.angularjs.org/misc/contribute
+* Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
 * Dashboard: http://dashboard.angularjs.org
 
 Building AngularJS
@@ -37,7 +37,7 @@ To execute end-to-end (e2e) tests, use:
     grunt test:e2e
 
 To learn more about the grunt tasks, run `grunt --help` and also read our
-[contribution guidelines](http://docs.angularjs.org/misc/contribute).
+[contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
 
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)

bower.json

@@ -2,11 +2,7 @@
   "name": "AngularJS",
   "devDependencies": {
     "jquery": "1.10.2",
-    "lunr.js": "0.4.3",
-    "open-sans-fontface": "1.0.4",
-    "google-code-prettify": "1.0.1",
     "closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip",
-    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip",
-    "bootstrap": "3.1.1"
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
   }
 }

docs/app/assets/css/docs.css

@@ -635,12 +635,14 @@ ul.events > li {
     display:inline-block;
     padding:3px 0;
   }
-  .nav-index-group .nav-index-listing:not(.nav-index-section) + .nav-index-listing:not(.nav-index-section):after {
-      padding-right:5px;
-      content:",  ";
+  .nav-index-group .nav-index-listing:not(.nav-index-section):after {
+    padding-right:5px;
+    margin-left:-3px;
+    content:",  ";
   }
-  .nav-index-group .nav-index-listing:last-child {
+  .nav-index-group .nav-index-listing:last-child:after {
     content:"";
+    display:inline-block;
   }
   .nav-index-group .nav-index-section {
     display:block;

docs/app/e2e/.jshintrc

@@ -0,0 +1,42 @@
+{
+  "extends": "../../../.jshintrc-base",
+
+  "globals": {
+
+    /* jasmine / karma */
+    "it": false,
+    "iit": false,
+    "describe": false,
+    "ddescribe": false,
+    "beforeEach": false,
+    "afterEach": false,
+    "expect": false,
+    "jasmine": false,
+    "spyOn": false,
+    "waits": false,
+    "waitsFor": false,
+    "runs": false,
+    "dump": false,
+
+    /* e2e */
+    "browser": false,
+    "element": false,
+    "by": false,
+
+    /* testabilityPatch / matchers */
+    "inject": false,
+    "module": false,
+    "dealoc": false,
+    "_jQuery": false,
+    "_jqLiteMode": false,
+    "sortedHtml": false,
+    "childrenTagsOf": false,
+    "assertHidden": false,
+    "assertVisible": false,
+    "provideLog": false,
+    "spyOnlyCallsWithArgs": false,
+    "createMockStyleSheet": false,
+    "browserTrigger": false,
+    "jqLiteCacheSize": false
+  }
+}

docs/app/e2e/api-docs/api-pages.scenario.js

@@ -0,0 +1,51 @@
+'use strict';
+
+describe("doc.angularjs.org", function() {
+
+  describe("API pages", function() {
+
+    it("should display links to code on GitHub", function() {
+      browser.get('index-debug.html#!/api/ng/service/$http');
+      expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
+
+      browser.get('index-debug.html#!/api/ng/service/$http');
+      expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
+    });
+
+    it('should change the page content when clicking a link to a service', function () {
+      browser.get('');
+
+      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
+      ngBindLink.click();
+
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('ngClick');
+    });
+
+
+    it('should show the functioning input directive example', function () {
+      browser.get('index-debug.html#!/api/ng/directive/input');
+
+      // Ensure that the page is loaded before trying to switch frames.
+      browser.waitForAngular();
+
+      browser.switchTo().frame('example-input-directive');
+
+      var nameInput = element(by.model('user.name'));
+      nameInput.sendKeys('!!!');
+
+      var code = element.all(by.css('tt')).first();
+      expect(code.getText()).toContain('guest!!!');
+    });
+
+    it("should trim indentation from code blocks", function() {
+      browser.get('index-debug.html#!/api/ng/type/$rootScope.Scope');
+
+      var codeBlocks = element.all(by.css('pre > code.lang-js'));
+      codeBlocks.each(function(codeBlock) {
+        var firstSpan = codeBlock.all(by.css('span')).first();
+        expect(firstSpan.getText()).not.toMatch(/^\W+$/);
+      });
+    });
+  });
+});

docs/app/e2e/api-docs/provider-pages.scenario.js

@@ -0,0 +1,12 @@
+'use strict';
+
+describe("provider pages", function() {
+
+  it("should show the related service", function() {
+    browser.get('index-debug.html#!/api/ng/provider/$compileProvider');
+    var serviceLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(serviceLink.getText()).toEqual('- $compile');
+    expect(serviceLink.getAttribute('href')).toMatch(/api\/ng\/service\/\$compile/);
+  });
+
+});

docs/app/e2e/api-docs/service-pages.scenario.js

@@ -0,0 +1,22 @@
+'use strict';
+
+describe("service pages", function() {
+
+  it("should show the related provider if there is one", function() {
+    browser.get('index-debug.html#!/api/ng/service/$compile');
+    var providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(providerLink.getText()).toEqual('- $compileProvider');
+    expect(providerLink.getAttribute('href')).toMatch(/api\/ng\/provider\/\$compileProvider/);
+
+    browser.get('index-debug.html#!/api/ng/service/$q');
+    providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(providerLink.getText()).not.toEqual('- $qProvider');
+    expect(providerLink.getAttribute('href')).not.toMatch(/api\/ng\/provider\/\$compileProvider/);
+  });
+
+  it("should show parameter defaults", function() {
+    browser.get('index-debug.html#!/api/ng/service/$timeout');
+    expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
+  });
+
+});

docs/app/e2e/app.scenario.js

@@ -26,21 +26,6 @@ describe('docs.angularjs.org', function () {
     });
 
 
-    it('should show the functioning input directive example', function () {
-      browser.get('index-debug.html#!/api/ng/directive/input');
-
-      // Ensure that the page is loaded before trying to switch frames.
-      browser.waitForAngular();
-
-      browser.switchTo().frame('example-input-directive');
-
-      var nameInput = element(by.model('user.name'));
-      nameInput.sendKeys('!!!');
-
-      var code = element.all(by.css('tt')).first();
-      expect(code.getText()).toContain('guest!!!');
-    });
-
 
     it('should be resilient to trailing slashes', function() {
       browser.get('index-debug.html#!/api/ng/function/angular.noop/');
@@ -67,22 +52,12 @@ describe('docs.angularjs.org', function () {
       browser.get('index-debug.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
       expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
     });
-  });
 
-  describe("templates", function() {
-    it("should show parameter defaults", function() {
-      browser.get('index-debug.html#!/api/ng/service/$timeout');
-      expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
+
+    it("should display an error if the page does not exist", function() {
+      browser.get('index-debug.html#!/api/does/not/exist');
+      expect(element(by.css('h1')).getText()).toBe('Oops!');
     });
   });
 
-  describe("API pages", function() {
-    it("should display links to code on GitHub", function() {
-      browser.get('index-debug.html#!/api/ng/service/$http');
-      expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
-
-      browser.get('index-debug.html#!/api/ng/service/$http');
-      expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
-    });
-  });
 });

docs/app/src/search.js

@@ -74,6 +74,7 @@ angular.module('search', [])
   var index = lunrSearch(function() {
     this.ref('id');
     this.field('title', {boost: 50});
+    this.field('members', { boost: 40});
     this.field('keywords', { boost : 20 });
   });
 
@@ -82,7 +83,8 @@ angular.module('search', [])
       index.store({
         id : key,
         title : page.searchTerms.titleWords,
-        keywords : page.searchTerms.keywords
+        keywords : page.searchTerms.keywords,
+        members : page.searchTerms.members
       });
     };
   });

docs/bower.json

@@ -0,0 +1,10 @@
+{
+  "name": "AngularJS-docs-app",
+  "dependencies": {
+    "jquery": "2.1.1",
+    "lunr.js": "0.4.3",
+    "open-sans-fontface": "1.0.4",
+    "google-code-prettify": "1.0.1",
+    "bootstrap": "3.1.1"
+  }
+}

docs/config/index.js

@@ -1,43 +1,153 @@
-var _ = require('lodash');
+"use strict";
+
 var path = require('canonical-path');
 var packagePath = __dirname;
 
-var basePackage = require('dgeni-packages/ngdoc');
-var examplesPackage = require('dgeni-packages/examples');
+var Package = require('dgeni').Package;
 
-module.exports = function(config) {
+// Create and export a new Dgeni package called dgeni-example. This package depends upon
+// the jsdoc and nunjucks packages defined in the dgeni-packages npm module.
+module.exports = new Package('angularjs', [
+  require('dgeni-packages/ngdoc'),
+  require('dgeni-packages/nunjucks'),
+  require('dgeni-packages/examples')
+])
 
-  config = basePackage(config);
-  config = examplesPackage(config);
 
-  config.append('processing.processors', [
-    require('./processors/git-data'),
-    require('./processors/error-docs'),
-    require('./processors/keywords'),
-    require('./processors/versions-data'),
-    require('./processors/pages-data'),
-    require('./processors/protractor-generate'),
-    require('./processors/index-page'),
-    require('./processors/debug-dump')
-  ]);
+.factory(require('./services/errorNamespaceMap'))
+.factory(require('./services/getMinerrInfo'))
+.factory(require('./services/getVersion'))
+.factory(require('./services/gitData'))
 
-  config.append('processing.tagDefinitions', [
-    require('./tag-defs/tutorial-step')
-  ]);
+.factory(require('./services/deployments/debug'))
+.factory(require('./services/deployments/default'))
+.factory(require('./services/deployments/jquery'))
+.factory(require('./services/deployments/production'))
 
-  config.append('processing.defaultTagTransforms', [
-    require('dgeni-packages/jsdoc/tag-defs/transforms/trim-whitespace')
-  ]);
+.factory(require('./inline-tag-defs/type'))
 
-  config.append('processing.inlineTagDefinitions', [
-    require('./inline-tag-defs/type')
-  ]);
 
-  config.set('processing.search.ignoreWordsFile', path.resolve(packagePath, 'ignore.words'));
+.processor(require('./processors/error-docs'))
+.processor(require('./processors/index-page'))
+.processor(require('./processors/keywords'))
+.processor(require('./processors/pages-data'))
+.processor(require('./processors/versions-data'))
 
-  config.prepend('rendering.templateFolders', [
-    path.resolve(packagePath, 'templates')
-  ]);
 
-  return config;
-};
+.config(function(dgeni, log, readFilesProcessor, writeFilesProcessor) {
+
+  dgeni.stopOnValidationError = true;
+  dgeni.stopOnProcessingError = true;
+
+  log.level = 'info';
+
+  readFilesProcessor.basePath = path.resolve(__dirname,'../..');
+  readFilesProcessor.sourceFiles = [
+    { include: 'src/**/*.js', basePath: 'src' },
+    { include: 'docs/content/**/*.ngdoc', basePath: 'docs/content' }
+  ];
+
+  writeFilesProcessor.outputFolder = 'build/docs';
+
+})
+
+
+.config(function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/tutorial-step'));
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/sortOrder'));
+})
+
+
+.config(function(inlineTagProcessor, typeInlineTagDef) {
+  inlineTagProcessor.inlineTagDefinitions.push(typeInlineTagDef);
+})
+
+
+.config(function(templateFinder, renderDocsProcessor, gitData) {
+  templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates'));
+  renderDocsProcessor.extraData.git = gitData;
+})
+
+
+.config(function(computePathsProcessor, computeIdsProcessor) {
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['error'],
+    pathTemplate: 'error/${namespace}/${name}',
+    outputPathTemplate: 'partials/error/${namespace}/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['errorNamespace'],
+    pathTemplate: 'error/${name}',
+    outputPathTemplate: 'partials/error/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['overview', 'tutorial'],
+    getPath: function(doc) {
+      var docPath = path.dirname(doc.fileInfo.relativePath);
+      if ( doc.fileInfo.baseName !== 'index' ) {
+        docPath = path.join(docPath, doc.fileInfo.baseName);
+      }
+      return docPath;
+    },
+    getOutputPath: function(doc) {
+      return 'partials/' + doc.path +
+          ( doc.fileInfo.baseName === 'index' ? '/index.html' : '.html');
+    }
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['e2e-test'],
+    getPath: function() {},
+    outputPathTemplate: 'ptore2e/${example.id}/${deployment.name}_test.js'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['indexPage'],
+    getPath: function() {},
+    outputPathTemplate: '${id}.html'
+  });
+
+
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['overview', 'tutorial', 'e2e-test', 'indexPage'],
+    getId: function(doc) { return doc.fileInfo.baseName; },
+    getAliases: function(doc) { return [doc.id]; }
+  });
+
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['error', 'errorNamespace'],
+    getId: function(doc) { return 'error:' + doc.name; },
+    getAliases: function(doc) { return [doc.id]; }
+  });
+})
+
+
+.config(function(
+  generateIndexPagesProcessor,
+  generateProtractorTestsProcessor,
+  generateExamplesProcessor,
+  debugDeployment, defaultDeployment,
+  jqueryDeployment, productionDeployment) {
+
+  generateIndexPagesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
+
+  generateProtractorTestsProcessor.deployments = [
+    defaultDeployment,
+    jqueryDeployment
+  ];
+
+  generateExamplesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
+});

docs/config/inline-tag-defs/type.js

@@ -1,12 +1,17 @@
-var typeClassFilter = require('dgeni-packages/ngdoc/rendering/filters/type-class');
+"use strict";
+
 var encoder = new require('node-html-encoder').Encoder();
 
-module.exports = {
-  name: 'type',
-  description: 'Replace with markup that displays a nice type',
-  handlerFactory: function() {
-    return function(doc, tagName, tagDescription) {
-      return '<a href="" class="' + typeClassFilter.process(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
-    };
-  }
-};
+/**
+ * @dgService typeInlineTagDef
+ * @description
+ * Replace with markup that displays a nice type
+ */
+module.exports = function typeInlineTagDef(getTypeClass) {
+  return {
+    name: 'type',
+    handler: function(doc, tagName, tagDescription) {
+      return '<a href="" class="' + getTypeClass(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
+    }
+  };
+};

docs/config/processors/debug-dump.js

@@ -1,33 +0,0 @@
-var fs = require('q-io/fs');
-var log = require('winston');
-var util = require("util");
-
-module.exports = {
-  name: 'debug-dump',
-  runBefore: ['write-files'],
-  description: 'This processor dumps docs that match a filter to a file',
-  process: function(docs, config) {
-
-    var filter, outputPath, depth;
-
-    filter = config.get('processing.debug-dump.filter');
-    outputPath = config.get('processing.debug-dump.outputPath');
-    depth = config.get('processing.debug-dump.depth', 2);
-
-
-    if ( filter && outputPath ) {
-      log.info('Dumping docs:', filter, outputPath);
-      var filteredDocs = filter(docs);
-      var dumpedDocs = util.inspect(filteredDocs, depth);
-      return writeFile(outputPath, dumpedDocs).then(function() {
-        return docs;
-      });
-    }
-  }
-};
-
-function writeFile(file, content) {
-  return fs.makeTree(fs.directory(file)).then(function() {
-    return fs.write(file, content, 'wb');
-  });
-}

docs/config/processors/error-docs.js

@@ -1,59 +1,52 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'error-docs',
-  description: 'Compute the various fields for docs in the Error area',
-  runAfter: ['tags-extracted', 'compute-path'],
-  runBefore: ['extra-docs-added'],
-  exports: {
-    errorNamespaces: ['factory', function() { return {}; }],
-    minerrInfo: ['factory', function(config) {
-      var minerrInfoPath = config.get('processing.errors.minerrInfoPath');
-      if ( !minerrInfoPath ) {
-        throw new Error('Error in configuration: Please provide a path to the minerr info file (errors.json) ' +
-          'in the `config.processing.errors.minerrInfoPath` property');
-      }
-      return require(minerrInfoPath);
-    }]
-  },
-  process: function(docs, partialNames, errorNamespaces, minerrInfo) {
+/**
+ * @dgProcessor errorDocsProcessor
+ * @description
+ * Process "error" docType docs and generate errorNamespace docs
+ */
+module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
+  return {
+    $runAfter: ['tags-extracted'],
+    $runBefore: ['extra-docs-added'],
+    $process: function(docs) {
 
-    // Create error namespace docs and attach error docs to each
-    _.forEach(docs, function(doc) {
-      if ( doc.docType === 'error' ) {
+      // Create error namespace docs and attach error docs to each
+      docs.forEach(function(doc) {
+        var parts, namespaceDoc;
 
-        // Parse out the error info from the id
-        parts = doc.name.split(':');
-        doc.namespace = parts[0];
-        doc.name = parts[1];
+        if ( doc.docType === 'error' ) {
 
+          // Parse out the error info from the id
+          parts = doc.name.split(':');
+          doc.namespace = parts[0];
+          doc.name = parts[1];
 
-        var namespaceDoc = errorNamespaces[doc.namespace];
-        if ( !namespaceDoc ) {
-          // First time we came across this namespace, so create a new one
-          namespaceDoc = errorNamespaces[doc.namespace] = {
-            area: doc.area,
-            name: doc.namespace,
-            errors: [],
-            path: path.dirname(doc.path),
-            outputPath: path.dirname(doc.outputPath) + '.html',
-            docType: 'errorNamespace'
-          };
+          // Get or create the relevant errorNamespace doc
+          namespaceDoc = errorNamespaceMap.get(doc.namespace);
+          if ( !namespaceDoc ) {
+            namespaceDoc = {
+              area: 'error',
+              name: doc.namespace,
+              errors: [],
+              docType: 'errorNamespace'
+            };
+            errorNamespaceMap.set(doc.namespace, namespaceDoc);
+          }
+
+          // Link this error doc to its namespace doc
+          namespaceDoc.errors.push(doc);
+          doc.namespaceDoc = namespaceDoc;
+          doc.formattedErrorMessage = getMinerrInfo().errors[doc.namespace][doc.name];
         }
+      });
 
-        // Add this error to the namespace
-        namespaceDoc.errors.push(doc);
-        doc.namespace = namespaceDoc;
-
-        doc.formattedErrorMessage = minerrInfo.errors[doc.namespace.name][doc.name];
-
-      }
-
-    });
-
-
-    return docs.concat(_.values(errorNamespaces));
-  }
-};
+      errorNamespaceMap.forEach(function(errorNamespace) {
+        docs.push(errorNamespace);
+      });
+    }
+  };
+};

docs/config/processors/git-data.js

@@ -1,20 +0,0 @@
-var gruntUtils = require('../../../lib/grunt/utils');
-var versionInfo = require('../../../lib/versions/version-info');
-
-module.exports = {
-  name: 'git-data',
-  runBefore: ['reading-files'],
-  description: 'This processor adds information from the local git repository to the extraData injectable',
-  exports: {
-    gitData: ['factory', function() {
-      return {
-        version: versionInfo.currentVersion,
-        versions: versionInfo.previousVersions,
-        info: versionInfo.gitRepoInfo
-      };
-    }]
-  },
-  process: function(extraData, gitData) {
-    extraData.git = gitData;
-  }
-};

docs/config/processors/index-page.js

@@ -1,40 +1,43 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'index-page',
-  runAfter: ['adding-extra-docs'],
-  runBefore: ['extra-docs-added'],
-  description: 'This processor creates docs that will be rendered as the index page for the app',
-  process: function(docs, config) {
+/**
+ * @dgProcessor generateIndexPagesProcessor
+ * @description
+ * This processor creates docs that will be rendered as the index page for the app
+ */
+module.exports = function generateIndexPagesProcessor() {
+  return {
+    deployments: [],
+    $validate: {
+      deployments: { presence: true }
+    },
+    $runAfter: ['adding-extra-docs'],
+    $runBefore: ['extra-docs-added'],
+    $process: function(docs) {
 
-    var deployment = config.deployment;
-    if ( !deployment || !deployment.environments ) {
-      throw new Error('No deployment environments found in the config.');
+      // Collect up all the areas in the docs
+      var areas = {};
+      docs.forEach(function(doc) {
+        if ( doc.area ) {
+          areas[doc.area] = doc.area;
+        }
+      });
+      areas = _.keys(areas);
+
+      this.deployments.forEach(function(deployment) {
+
+        var indexDoc = _.defaults({
+          docType: 'indexPage',
+          areas: areas
+        }, deployment);
+
+        indexDoc.id = 'index' + (deployment.name === 'default' ? '' : '-' + deployment.name);
+
+        docs.push(indexDoc);
+      });
     }
-
-    // Collect up all the areas in the docs
-    var areas = {};
-    _.forEach(docs, function(doc) {
-      if ( doc.area ) {
-        areas[doc.area] = doc.area;
-      }
-    });
-    areas = _.keys(areas);
-
-    _.forEach(deployment.environments, function(environment) {
-
-      var indexDoc = _.defaults({
-        docType: 'indexPage',
-        areas: areas
-      }, environment);
-
-      indexDoc.id = 'index' + (environment.name === 'default' ? '' : '-' + environment.name);
-      // Use .. to put it at the root of the build
-      indexDoc.outputPath = indexDoc.id + '.html';
-
-      docs.push(indexDoc);
-    });
-  }
-};
+  };
+};

docs/config/processors/keywords.js

@@ -1,50 +1,64 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var fs = require('fs');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'keywords',
-  runAfter: ['docs-processed'],
-  runBefore: ['adding-extra-docs'],
-  description: 'This processor extracts all the keywords from the document',
-  process: function(docs, config) {
+/**
+ * @dgProcessor generateKeywordsProcessor
+ * @description
+ * This processor extracts all the keywords from each document and creates
+ * a new document that will be rendered as a JavaScript file containing all
+ * this data.
+ */
+module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
+  return {
+    ignoreWordsFile: undefined,
+    areasToSearch: ['api', 'guide', 'misc', 'error', 'tutorial'],
+    propertiesToIgnore: [],
+    $validate: {
+      ignoreWordsFile: { },
+      areasToSearch: { presence: true },
+      propertiesToIgnore: {  }
+    },
+    $runAfter: ['memberDocsProcessor'],
+    $runBefore: ['rendering-docs'],
+    $process: function(docs) {
 
-    // Keywords to ignore
-    var wordsToIgnore = [];
-    var propertiesToIgnore;
-    var areasToSearch;
+      // Keywords to ignore
+      var wordsToIgnore = [];
+      var propertiesToIgnore;
+      var areasToSearch;
 
-    // Keywords start with "ng:" or one of $, _ or a letter
-    var KEYWORD_REGEX = /^((ng:|[\$_a-z])[\w\-_]+)/;
+      // Keywords start with "ng:" or one of $, _ or a letter
+      var KEYWORD_REGEX = /^((ng:|[\$_a-z])[\w\-_]+)/;
 
-    // Load up the keywords to ignore, if specified in the config
-    if ( config.processing.search && config.processing.search.ignoreWordsFile ) {
+      // Load up the keywords to ignore, if specified in the config
+      if ( this.ignoreWordsFile ) {
 
-      var ignoreWordsPath = path.resolve(config.basePath, config.processing.search.ignoreWordsFile);
-      wordsToIgnore = fs.readFileSync(ignoreWordsPath, 'utf8').toString().split(/[,\s\n\r]+/gm);
+        var ignoreWordsPath = path.resolve(readFilesProcessor.basePath, this.ignoreWordsFile);
+        wordsToIgnore = fs.readFileSync(ignoreWordsPath, 'utf8').toString().split(/[,\s\n\r]+/gm);
 
-      log.debug('Loaded ignore words from "' + ignoreWordsPath + '"');
-      log.silly(wordsToIgnore);
+        log.debug('Loaded ignore words from "' + ignoreWordsPath + '"');
+        log.silly(wordsToIgnore);
 
-    }
-
-    areasToSearch = _.indexBy(config.get('processing.search.areasToSearch', ['api', 'guide', 'misc', 'error', 'tutorial']));
-
-    propertiesToIgnore = _.indexBy(config.get('processing.search.propertiesToIgnore', []));
-    log.debug('Properties to ignore', propertiesToIgnore);
-
-    var ignoreWordsMap = _.indexBy(wordsToIgnore);
-
-    // If the title contains a name starting with ng, e.g. "ngController", then add the module name
-    // without the ng to the title text, e.g. "controller".
-    function extractTitleWords(title) {
-      var match = /ng([A-Z]\w*)/.exec(title);
-      if ( match ) {
-        title = title + ' ' + match[1].toLowerCase();
       }
-      return title;
-    }
+
+      areasToSearch = _.indexBy(this.areasToSearch);
+      propertiesToIgnore = _.indexBy(this.propertiesToIgnore);
+      log.debug('Properties to ignore', propertiesToIgnore);
+
+      var ignoreWordsMap = _.indexBy(wordsToIgnore);
+
+      // If the title contains a name starting with ng, e.g. "ngController", then add the module name
+      // without the ng to the title text, e.g. "controller".
+      function extractTitleWords(title) {
+        var match = /ng([A-Z]\w*)/.exec(title);
+        if ( match ) {
+          title = title + ' ' + match[1].toLowerCase();
+        }
+        return title;
+      }
 
     function extractWords(text, words, keywordMap) {
 
@@ -52,37 +66,49 @@ module.exports = {
       _.forEach(tokens, function(token){
         var match = token.match(KEYWORD_REGEX);
         if (match){
-          key = match[1];
+          var key = match[1];
           if ( !keywordMap[key]) {
             keywordMap[key] = true;
             words.push(key);
           }
-        }
-      });
-    }
+          }
+        });
+      }
 
 
-    // We are only interested in docs that live in the right area
-    docs = _.filter(docs, function(doc) { return areasToSearch[doc.area]; });
+      // We are only interested in docs that live in the right area
+      docs = _.filter(docs, function(doc) { return areasToSearch[doc.area]; });
 
-    _.forEach(docs, function(doc) {
+      _.forEach(docs, function(doc) {
 
       var words = [];
       var keywordMap = _.clone(ignoreWordsMap);
+      var members = [];
+      var membersMap = {};
 
       // Search each top level property of the document for search terms
       _.forEach(doc, function(value, key) {
+
         if ( _.isString(value) && !propertiesToIgnore[key] ) {
           extractWords(value, words, keywordMap);
         }
+
+        if ( key === 'methods' || key === 'properties' || key === 'events' ) {
+          _.forEach(value, function(member) {
+            extractWords(member.name, members, membersMap);
+          });
+        }
       });
 
+
       doc.searchTerms = {
         titleWords: extractTitleWords(doc.name),
-        keywords: _.sortBy(words).join(' ')
+        keywords: _.sortBy(words).join(' '),
+        members: _.sortBy(members).join(' ')
       };
 
-    });
+      });
 
-  }
+    }
+  };
 };

docs/config/processors/pages-data.js

@@ -1,6 +1,7 @@
+"use strict";
+
 var _ = require('lodash');
 var path = require('canonical-path');
-var log = require('winston');
 
 var AREA_NAMES = {
   api: 'API',
@@ -33,182 +34,192 @@ function getNavGroup(pages, area, pageSorter, pageMapper) {
 }
 
 
-var navGroupMappers = {
-  api: function(areaPages, area) {
-    var navGroups = _(areaPages)
-      .filter('module') // We are not interested in docs that are not in a module
+/**
+ * @dgProcessor generatePagesDataProcessor
+ * @description
+ * This processor will create a new doc that will be rendered as a JavaScript file
+ * containing meta information about the pages and navigation
+ */
+module.exports = function generatePagesDataProcessor(log) {
 
-      .groupBy('module')
 
-      .map(function(modulePages, moduleName) {
-        log.debug('moduleName: ' + moduleName);
-        var navItems = [];
-        var modulePage;
+  var navGroupMappers = {
+    api: function(areaPages, area) {
+      var navGroups = _(areaPages)
+        .filter('module') // We are not interested in docs that are not in a module
 
-        _(modulePages)
+        .groupBy('module')
 
-          .groupBy('docType')
+        .map(function(modulePages, moduleName) {
+          log.debug('moduleName: ' + moduleName);
+          var navItems = [];
+          var modulePage;
 
-          .tap(function(docTypes) {
-            log.debug(_.keys(docTypes));
-            // Extract the module page from the collection
-            modulePage = docTypes.module[0];
-            delete docTypes.module;
-          })
+          _(modulePages)
 
-          .tap(function(docTypes) {
-            if ( docTypes.input ) {
-              docTypes.directive = docTypes.directive || [];
-              // Combine input docTypes into directive docTypes
-              docTypes.directive = docTypes.directive.concat(docTypes.input);
-              delete docTypes.input;
-            }
-          })
+            .groupBy('docType')
 
-          .forEach(function(sectionPages, sectionName) {
+            .tap(function(docTypes) {
+              log.debug(moduleName, _.keys(docTypes));
+              // Extract the module page from the collection
+              modulePage = docTypes.module[0];
+              delete docTypes.module;
+            })
 
-            sectionPages = _.sortBy(sectionPages, 'name');
+            .tap(function(docTypes) {
+              if ( docTypes.input ) {
+                docTypes.directive = docTypes.directive || [];
+                // Combine input docTypes into directive docTypes
+                docTypes.directive = docTypes.directive.concat(docTypes.input);
+                delete docTypes.input;
+              }
+            })
 
-            if ( sectionPages.length > 0 ) {
-              // Push a navItem for this section
-              navItems.push({
-                name: sectionName,
-                type: 'section',
-                href: path.dirname(sectionPages[0].path)
-              });
+            .forEach(function(sectionPages, sectionName) {
 
-              // Push the rest of the sectionPages for this section
-              _.forEach(sectionPages, function(sectionPage) {
+              sectionPages = _.sortBy(sectionPages, 'name');
 
+              if ( sectionPages.length > 0 ) {
+                // Push a navItem for this section
                 navItems.push({
-                  name: sectionPage.name,
-                  href: sectionPage.path,
-                  type: sectionPage.docType
+                  name: sectionName,
+                  type: 'section',
+                  href: path.dirname(sectionPages[0].path)
                 });
 
-              });
-            }
-          });
+                // Push the rest of the sectionPages for this section
+                _.forEach(sectionPages, function(sectionPage) {
+
+                  navItems.push({
+                    name: sectionPage.name,
+                    href: sectionPage.path,
+                    type: sectionPage.docType
+                  });
+
+                });
+              }
+            });
+          return {
+            name: moduleName,
+            href: modulePage.path,
+            type: 'group',
+            navItems: navItems
+          };
+        })
+        .value();
+      return navGroups;
+    },
+    tutorial: function(pages, area) {
+      return [getNavGroup(pages, area, 'step', function(page) {
         return {
-          name: moduleName,
-          href: modulePage.path,
-          type: 'group',
-          navItems: navItems
+          name: page.name,
+          step: page.step,
+          href: page.path,
+          type: 'tutorial'
         };
-      })
-      .value();
-    return navGroups;
-  },
-  tutorial: function(pages, area) {
-    return [getNavGroup(pages, area, 'step', function(page) {
-      return {
-        name: page.name,
-        step: page.step,
-        href: page.path,
-        type: 'tutorial'
-      };
-    })];
-  },
-  error: function(pages, area) {
-    return [getNavGroup(pages, area, 'path', function(page) {
-      return {
-        name: page.name,
-        href: page.path,
-        type: page.docType === 'errorNamespace' ? 'section' : 'error'
-      };
-    })];
-  },
-  pages: function(pages, area) {
-    return [getNavGroup(pages, area, 'path', function(page) {
-      return {
-        name: page.name,
-        href: page.path,
-        type: 'page'
-      };
-    })];
-  }
-};
-
-module.exports = {
-  name: 'pages-data',
-  description: 'This plugin will create a new doc that will be rendered as an angularjs module ' +
-               'which will contain meta information about the pages and navigation',
-  runAfter: ['adding-extra-docs', 'component-groups-generate', 'compute-path'],
-  runBefore: ['extra-docs-added'],
-  process: function(docs, config) {
-
-    var outputFolder = config.rendering.outputFolder;
-
-    _(docs)
-    .filter(function(doc) { return doc.area === 'api'; })
-    .filter(function(doc) { return doc.docType === 'module'; })
-    .forEach(function(doc) { if ( !doc.path ) {
-      log.warn('Missing path property for ', doc.id);
-    }})
-    .map(function(doc) { return _.pick(doc, ['id', 'module', 'docType', 'area']); })
-    .tap(function(docs) {
-      log.debug(docs);
-    });
-
-
-    // We are only interested in docs that are in a area and not landing pages
-    var navPages = _.filter(docs, function(page) {
-      return page.area &&
-        page.docType != 'componentGroup';
-    });
-
-    // Generate an object collection of pages that is grouped by area e.g.
-    // - area "api"
-    //  - group "ng"
-    //    - section "directive"
-    //    - ngApp
-    //    - ngBind
-    //    - section "global"
-    //    - angular.element
-    //    - angular.bootstrap
-    //    - section "service"
-    //    - $compile
-    //  - group "ngRoute"
-    //    - section "directive"
-    //    - ngView
-    //    - section "service"
-    //    - $route
-    //
-    var areas = {};
-    _(navPages)
-      .groupBy('area')
-      .forEach(function(pages, areaId) {
-        var area = {
-          id: areaId,
-          name: AREA_NAMES[areaId]
+      })];
+    },
+    error: function(pages, area) {
+      return [getNavGroup(pages, area, 'path', function(page) {
+        return {
+          name: page.name,
+          href: page.path,
+          type: page.docType === 'errorNamespace' ? 'section' : 'error'
         };
-        areas[areaId] = area;
+      })];
+    },
+    pages: function(pages, area) {
+      return [getNavGroup(
+        pages,
+        area,
+        function(page) {
+          return page.sortOrder || page.path;
+        },
+        function(page) {
+          return {
+            name: page.name,
+            href: page.path,
+            type: 'page'
+          };
+        }
+      )];
+    }
+  };
 
-        var navGroupMapper = navGroupMappers[area.id] || navGroupMappers['pages'];
-        area.navGroups = navGroupMapper(pages, area);
+  return {
+    $runAfter: ['paths-computed'],
+    $runBefore: ['rendering-docs'],
+    $process: function(docs) {
+
+      _(docs)
+      .filter(function(doc) { return doc.area === 'api' && doc.docType === 'module'; })
+      .forEach(function(doc) { if ( !doc.path ) {
+        log.warn('Missing path property for ', doc.id);
+      }})
+      .map(function(doc) { return _.pick(doc, ['id', 'module', 'docType', 'area']); })
+      .tap(function(docs) {
+        log.debug(docs);
       });
 
-    // Extract a list of basic page information for mapping paths to partials and for client side searching
-    var pages = _(docs)
-      .map(function(doc) {
-        var page = _.pick(doc, [
-          'docType', 'id', 'name', 'area', 'outputPath', 'path', 'searchTerms'
-        ]);
-        return page;
-      })
-      .indexBy('path')
-      .value();
 
+      // We are only interested in docs that are in an area and are not landing pages
+      var navPages = _.filter(docs, function(page) {
+        return page.area && page.docType != 'componentGroup';
+      });
 
-    var docData = {
-      docType: 'pages-data',
-      id: 'pages-data',
-      template: 'pages-data.template.js',
-      outputPath: 'js/pages-data.js',
+      // Generate an object collection of pages that is grouped by area e.g.
+      // - area "api"
+      //  - group "ng"
+      //    - section "directive"
+      //    - ngApp
+      //    - ngBind
+      //    - section "global"
+      //    - angular.element
+      //    - angular.bootstrap
+      //    - section "service"
+      //    - $compile
+      //  - group "ngRoute"
+      //    - section "directive"
+      //    - ngView
+      //    - section "service"
+      //    - $route
+      //
+      var areas = {};
+      _(navPages)
+        .groupBy('area')
+        .forEach(function(pages, areaId) {
+          var area = {
+            id: areaId,
+            name: AREA_NAMES[areaId]
+          };
+          areas[areaId] = area;
 
-      areas: areas,
-      pages: pages
-    };
-    docs.push(docData);
+          var navGroupMapper = navGroupMappers[area.id] || navGroupMappers['pages'];
+          area.navGroups = navGroupMapper(pages, area);
+        });
+
+      // Extract a list of basic page information for mapping paths to partials and for client side searching
+      var pages = _(docs)
+        .map(function(doc) {
+          var page = _.pick(doc, [
+            'docType', 'id', 'name', 'area', 'outputPath', 'path', 'searchTerms'
+          ]);
+          return page;
+        })
+        .indexBy('path')
+        .value();
+
+      var docData = {
+        docType: 'pages-data',
+        id: 'pages-data',
+        template: 'pages-data.template.js',
+        outputPath: 'js/pages-data.js',
+
+        areas: areas,
+        pages: pages
+      };
+
+      docs.push(docData);
+    }
   }
 };

docs/config/processors/protractor-generate.js

@@ -1,50 +0,0 @@
-var _ = require('lodash');
-var path = require('canonical-path');
-
-module.exports = {
-  name: 'protractor-generate',
-  description: 'Generate a protractor test file from the e2e tests in the examples',
-  runAfter: ['adding-extra-docs'],
-  runBefore: ['extra-docs-added'],
-  process: function(docs, examples, config) {
-    var protractorFolder = config.get('rendering.protractor.outputFolder', 'ptore2e');
-
-    _.forEach(examples, function(example) {
-
-      _.forEach(example.files, function(file) {
-
-        // Check if it's a Protractor test.
-        if (file.type !== 'protractor') {
-          return;
-        }
-
-        // Create new files for the tests.
-        docs.push(createProtractorDoc(example, file, 'jquery'));
-        docs.push(createProtractorDoc(example, file, 'jqlite'));
-      });
-    });
-
-    function createProtractorDoc(example, file, env) {
-      var protractorDoc = {
-        docType: 'e2e-test',
-        id: 'protractorTest' + '-' + example.id,
-        template: 'protractorTests.template.js',
-        outputPath: path.join(protractorFolder, example.id, env + '_test.js'),
-        innerTest: file.fileContents,
-        pathPrefix: '.', // Hold for if we test with full jQuery
-        exampleId: example.id,
-        description: example.doc.id,
-        'ng-app-included': example['ng-app-included']
-      };
-
-      if (env === 'jquery') {
-        protractorDoc.examplePath = example.outputFolder + '/index-jquery.html';
-      } else {
-        protractorDoc.examplePath = example.outputFolder + '/index.html';
-      }
-      return protractorDoc;
-    }
-
-
-  }
-};

docs/config/processors/versions-data.js

@@ -1,38 +1,34 @@
+"use strict";
+
 var _ = require('lodash');
 
-module.exports = {
-  name: 'versions-data',
-  description: 'This plugin will create a new doc that will be rendered as an angularjs module ' +
-               'which will contain meta information about the versions of angular',
-  runAfter: ['adding-extra-docs', 'pages-data'],
-  runBefore: ['extra-docs-added'],
-  process: function(docs, gitData) {
+/**
+ * @dgProcessor generateVersionDocProcessor
+ * @description
+ * This processor will create a new doc that will be rendered as a JavaScript file
+ * containing meta information about the current versions of AngularJS
+ */
+module.exports = function generateVersionDocProcessor(gitData) {
+  return {
+    $runAfter: ['generatePagesDataProcessor'],
+    $runBefore: ['rendering-docs'],
+    $process: function(docs) {
 
-    var version = gitData.version;
-    var versions = gitData.versions;
+      var versionDoc = {
+        docType: 'versions-data',
+        id: 'versions-data',
+        template: 'versions-data.template.js',
+        outputPath: 'js/versions-data.js',
+        currentVersion: gitData.version
+      };
 
-    if ( !version ) {
-      throw new Error('Invalid configuration.  Please provide a valid `source.currentVersion` property');
+      versionDoc.versions = _(gitData.versions)
+        .filter(function(version) { return version.major > 0; })
+        .push(gitData.version)
+        .reverse()
+        .value();
+
+      docs.push(versionDoc);
     }
-    if ( !versions ) {
-      throw new Error('Invalid configuration.  Please provide a valid `source.previousVersions` property');
-    }
-
-    var versionDoc = {
-      docType: 'versions-data',
-      id: 'versions-data',
-      template: 'versions-data.template.js',
-      outputPath: 'js/versions-data.js',
-    };
-
-    versionDoc.currentVersion = version;
-
-    versionDoc.versions = _(versions)
-      .filter(function(version) { return version.major > 0; })
-      .push(version)
-      .reverse()
-      .value();
-
-    docs.push(versionDoc);
-  }
-};
+  };
+};

docs/config/services/deployments/debug.js

@@ -0,0 +1,39 @@
+"use strict";
+
+module.exports = function debugDeployment(getVersion) {
+  return {
+    name: 'debug',
+    examples: {
+      commonFiles: {
+        scripts: [ '../../../angular.js' ]
+      },
+      dependencyPath: '../../../'
+    },
+    scripts: [
+      '../angular.js',
+      '../angular-resource.js',
+      '../angular-route.js',
+      '../angular-cookies.js',
+      '../angular-sanitize.js',
+      '../angular-touch.js',
+      '../angular-animate.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/deployments/default.js

@@ -0,0 +1,39 @@
+"use strict";
+
+module.exports = function defaultDeployment(getVersion) {
+  return {
+    name: 'default',
+    examples: {
+      commonFiles: {
+        scripts: [ '../../../angular.min.js' ]
+      },
+      dependencyPath: '../../../'
+    },
+    scripts: [
+      '../angular.min.js',
+      '../angular-resource.min.js',
+      '../angular-route.min.js',
+      '../angular-cookies.min.js',
+      '../angular-sanitize.min.js',
+      '../angular-touch.min.js',
+      '../angular-animate.min.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/deployments/jquery.js

@@ -0,0 +1,43 @@
+"use strict";
+
+module.exports = function jqueryDeployment(getVersion) {
+  return {
+    name: 'jquery',
+    examples: {
+      commonFiles: {
+        scripts: [
+          '../../components/jquery-' + getVersion('jquery') + '/jquery.js',
+          '../../../angular.js'
+        ]
+      },
+      dependencyPath: '../../../'
+    },
+    scripts: [
+      'components/jquery-' + getVersion('jquery') + '/jquery.js',
+      '../angular.min.js',
+      '../angular-resource.min.js',
+      '../angular-route.min.js',
+      '../angular-cookies.min.js',
+      '../angular-sanitize.min.js',
+      '../angular-touch.min.js',
+      '../angular-animate.min.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/deployments/production.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var versionInfo = require('../../../../lib/versions/version-info');
+var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + versionInfo.cdnVersion;
+
+module.exports = function productionDeployment(getVersion) {
+  return {
+    name: 'production',
+    examples: {
+      commonFiles: {
+        scripts: [ cdnUrl + '/angular.min.js' ]
+      },
+      dependencyPath: cdnUrl + '/'
+    },
+    scripts: [
+      cdnUrl + '/angular.min.js',
+      cdnUrl + '/angular-resource.min.js',
+      cdnUrl + '/angular-route.min.js',
+      cdnUrl + '/angular-cookies.min.js',
+      cdnUrl + '/angular-sanitize.min.js',
+      cdnUrl + '/angular-touch.min.js',
+      cdnUrl + '/angular-animate.min.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/errorNamespaceMap.js

@@ -0,0 +1,10 @@
+"use strict";
+var StringMap = require('stringmap');
+
+/**
+ * @dgService errorNamespaceMap
+ * A map of error namespaces by name.
+ */
+module.exports = function errorNamespaceMap() {
+  return new StringMap();
+};

docs/config/services/getMinerrInfo.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var path = require('canonical-path');
+
+/**
+ * @dgService minErrInfo
+ * @description
+ * Load the error information that was generated during the AngularJS build.
+ */
+module.exports = function getMinerrInfo(readFilesProcessor) {
+  return function() {
+    var minerrInfoPath = path.resolve(readFilesProcessor.basePath, 'build/errors.json');
+    return require(minerrInfoPath);
+  };
+};

docs/config/services/getVersion.js

@@ -0,0 +1,17 @@
+"use strict";
+var path = require('canonical-path');
+
+/**
+ * dgService getVersion
+ * @description
+ * Find the current version of the bower component (or npm module)
+ */
+module.exports = function getVersion(readFilesProcessor) {
+  var basePath = readFilesProcessor.basePath;
+
+  return function(component, sourceFolder, packageFile) {
+    sourceFolder = path.resolve(basePath, sourceFolder || 'docs/bower_components');
+    packageFile = packageFile || 'bower.json';
+    return require(path.join(sourceFolder,component,packageFile)).version;
+  };
+};

docs/config/services/gitData.js

@@ -0,0 +1,17 @@
+"use strict";
+
+var gruntUtils = require('../../../lib/grunt/utils');
+var versionInfo = require('../../../lib/versions/version-info');
+
+/**
+ * @dgService gitData
+ * @description
+ * Information from the local git repository
+ */
+module.exports = function gitData() {
+  return {
+    version: versionInfo.currentVersion,
+    versions: versionInfo.previousVersions,
+    info: versionInfo.gitRepoInfo
+  };
+};

docs/config/tag-defs/sortOrder.js

@@ -0,0 +1,6 @@
+module.exports = {
+  name: 'sortOrder',
+  transforms: function(doc, tag, value) {
+    return parseInt(value, 10);
+  }
+};

docs/config/templates/protractorTests.template.js

@@ -1,10 +0,0 @@
-describe("{$ doc.description $}", function() {
-  var rootEl;
-  beforeEach(function() {
-    rootEl = browser.rootEl;{% if doc['ng-app-included'] %}
-    browser.rootEl = '[ng-app]';{% endif %}
-    browser.get("{$ doc.pathPrefix $}/{$ doc.examplePath $}");
-  });
-  {% if doc['ng-app-included'] %}afterEach(function() { browser.rootEl = rootEl; });{% endif %}
-{$ doc.innerTest $}
-});

docs/config/templates/runnableExample.template.html

@@ -2,15 +2,16 @@
    is HTML and wrap each line in a <p> - thus breaking the HTML #}
 
 <div>
-  <a ng-click="openPlunkr('{$ doc.example.outputFolder $}')" class="btn pull-right">
+  <a ng-click="openPlunkr('{$ doc.path $}')" class="btn pull-right">
     <i class="glyphicon glyphicon-edit">&nbsp;</i>
     Edit in Plunker</a>
+
   <div class="runnable-example"
-      path="{$ doc.example.outputFolder $}"
+      path="{$ doc.example.deployments.default.path $}"
       {%- for attrName, attrValue in doc.example.attributes %}
       {$ attrName $}="{$ attrValue $}"{% endfor %}>
 
-   {% for fileName, file in doc.example.files %}
+  {% for fileName, file in doc.example.files %}
     <div class="runnable-example-file" {% for attrName, attrValue in file.attributes %}
       {$ attrName $}="{$ attrValue $}"{% endfor %}>
       {% code -%}
@@ -19,7 +20,7 @@
     </div>
   {% endfor %}
 
-    <iframe class="runnable-example-frame" src="{$ doc.example.outputFolder $}/index.html" name="{$ doc.example.id $}"></iframe>
+    <iframe class="runnable-example-frame" src="{$ doc.example.deployments.default.outputPath $}" name="{$ doc.example.id $}"></iframe>
   </div>
 </div>
 

docs/content/error/$sce/unsafe.ngdoc

@@ -10,7 +10,7 @@ Angular's {@link ng.$sce Strict Contextual Escaping (SCE)} mode
 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.)
 
-This helps prevent XSS and other security issues.  Read more at {@link
-api/ng.$sce Strict Contextual Escaping (SCE)}
+This helps prevent XSS and other security issues.  Read more at
+{@link ng.$sce Strict Contextual Escaping (SCE)}
 
 You may want to include the ngSanitize module to use the automatic sanitizing.

docs/content/guide/$location.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Using $location
+@sortOrder 500
 @description
 
 # What does it do?

docs/content/guide/animations.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Animations
+@sortOrder 310
 @description
 
 

docs/content/guide/bootstrap.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Bootstrap
+@sortOrder 350
 @description
 
 # Bootstrap

docs/content/guide/compiler.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  HTML Compiler
+@sortOrder 330
 @description
 
 <div class="alert alert-warning">

docs/content/guide/concepts.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Conceptual Overview
+@sortOrder 200
 @description
 
 # Conceptual Overview

docs/content/guide/controller.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Controllers
+@sortOrder 220
 @description
 
 # Understanding Controllers

docs/content/guide/css-styling.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Working With CSS
+@sortOrder 510
 @description
 
 

docs/content/guide/databinding.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Data Binding
+@sortOrder 210
 @description
 
 Data-binding in Angular apps is the automatic synchronization of data between the model and view

docs/content/guide/di.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Dependency Injection
+@sortOrder 250
 @description
 
 # Dependency Injection
@@ -109,7 +110,7 @@ asks the injector to create an instance of the controller and its dependencies.
 injector.instantiate(MyController);
 ```
 
-This is all done behinds the scenes. Notice that by having the `ng-controller` ask the injector to
+This is all done behind the scenes. Notice that by having the `ng-controller` ask the injector to
 instantiate the class, it can satisfy all of the dependencies of `MyController` without the
 controller ever knowing about the injector.
 

docs/content/guide/directive.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Directives
+@sortOrder 300
 @description
 
 # Creating Custom Directives

docs/content/guide/e2e-testing.ngdoc

@@ -1,6 +1,6 @@
-@workInProgress
 @ngdoc overview
 @name  E2E Testing
+@sortOrder 420
 @description
 
 # E2E Testing

docs/content/guide/expression.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Expressions
+@sortOrder 270
 @description
 
 # Angular Expressions
@@ -38,7 +39,9 @@ the method from your view. If you want to `eval()` an Angular expression yoursel
 ## Example
 <example>
   <file name="index.html">
-    1+2={{1+2}}
+    <span>
+      1+2={{1+2}}
+    </span>
   </file>
 
   <file name="protractor.js" type="protractor">

docs/content/guide/filter.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Filters
+@sortOrder 280
 @description
 
 A filter formats the value of an expression for display to the user. They can be used in view templates,

docs/content/guide/forms.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Forms
+@sortOrder 290
 @description
 
 Controls (`input`, `select`, `textarea`) are ways for a user to enter data.
@@ -205,7 +206,7 @@ In the following example we create two directives.
   * The first one is `integer` and it validates whether the input is a valid integer.
     For example `1.23` is an invalid value, since it contains a fraction.
     Note that we unshift the array instead of pushing.
-    This is because we want to be first parser and consume the control string value, as we need to execute the validation function before a conversion to number occurs.
+    This is because we want it to be the first parser and consume the control string value, as we need to execute the validation function before a conversion to number occurs.
 
   * The second directive is a `smart-float`.
     It parses both `1.2` and `1,2` into a valid float number `1.2`.

docs/content/guide/i18n.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  i18n and l10n
+@sortOrder 520
 @description
 
 # i18n and l10n

docs/content/guide/ie.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Internet Explorer Compatibility
+@sortOrder 530
 @description
 
 # Internet Explorer Compatibility

docs/content/guide/introduction.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Introduction
+@sortOrder 100
 @description
 
 

docs/content/guide/migration.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Migrating from 1.0 to 1.2
+@sortOrder 550
 @description
 
 # Migrating from 1.0 to 1.2

docs/content/guide/module.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Modules
+@sortOrder 320
 @description
 
 # What is a Module?

docs/content/guide/providers.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Providers
+@sortOrder 340
 @description
 
 # Providers
@@ -97,9 +98,8 @@ created by this recipe.
 Note: All services in Angular 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 Factory is more a powerful version of the Value recipe, you can construct the same service with it.
-Using our previous `clientId` Value recipe example, we can rewrite it as a Factory recipe like
-this:
+Since a Factory is a more powerful version of the Value recipe, the same service can be constructed with it.
+Using our previous `clientId` Value recipe example, we can rewrite it as a Factory recipe like this:
 
 ```javascript
 myApp.factory('clientId', function clientIdFactory() {
@@ -134,11 +134,11 @@ token.
 
 <div class="alert alert-success">
 **Best Practice:** name the factory functions as `<serviceId>Factory`
-(e.g. apiTokenFactory). While this naming convention is not required, it helps when navigating the code base
+(e.g., apiTokenFactory). While this naming convention is not required, it helps when navigating the codebase
 or looking at stack traces in the debugger.
 </div>
 
-Just like with Value recipe, Factory recipe can create a service of any type, whether it be a
+Just like with the Value recipe, the Factory recipe can create a service of any type, whether it be a
 primitive, object literal, function, or even an instance of a custom type.
 
 
@@ -153,7 +153,7 @@ function UnicornLauncher(apiToken) {
 
   this.launchedCount = 0;
   this.launch = function() {
-    // make a request to the remote api and include the apiToken
+    // Make a request to the remote API and include the apiToken
     ...
     this.launchedCount++;
   }
@@ -170,7 +170,7 @@ myApp.factory('unicornLauncher', ["apiToken", function(apiToken) {
 ```
 
 
-This is, however, exactly the use-case that Service recipe is the most suitable for.
+This is, however, exactly the use-case that the Service recipe is the most suitable for.
 
 The Service recipe produces a service just like the Value or Factory recipes, but it does so by
 *invoking a constructor with the `new` operator*. The constructor can take zero or more arguments,
@@ -189,7 +189,7 @@ myApp.service('unicornLauncher', ["apiToken", UnicornLauncher]);
 Much simpler!
 
 Note: Yes, we have called one of our service recipes 'Service'. We regret this and know that we'll
-be somehow punished for our mis-deed. It's like we named one of our offspring 'Child'. Boy,
+be somehow punished for our misdeed. It's like we named one of our offspring 'Child'. Boy,
 that would mess with the teachers.
 
 
@@ -199,8 +199,8 @@ As already mentioned in the intro, the Provider recipe is the core recipe type a
 all the other recipe types are just syntactic sugar on top of it. It is the most verbose recipe
 with the most abilities, but for most services it's overkill.
 
-Provider recipe is syntactically defined as a custom type that implements a `$get` method. This
-method is a factory function just like the one we use in Factory recipe. In fact, if you define
+The Provider recipe is syntactically defined as a custom type that implements a `$get` method. This
+method is a factory function just like the one we use in the Factory recipe. In fact, if you define
 a Factory recipe, an empty Provider type with the `$get` method set to your factory function is
 automatically created under the hood.
 
@@ -248,7 +248,7 @@ and wires (injects) all provider instances only.
 
 During application bootstrap, before Angular 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.
+During this phase, services aren't accessible because they haven't been created yet.
 
 Once the configuration phase is over, interaction with providers is disallowed and the process of
 creating services starts. We call this part of the application life-cycle the run phase.
@@ -259,9 +259,9 @@ creating services starts. We call this part of the application life-cycle the ru
 We've just learned how Angular 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 Value recipe.
+even to simple value objects created via the Value recipe.
 
-Since simple values, like url prefix, don't have dependencies or configuration, it is often handy
+Since simple values, like URL prefixes, don't have dependencies or configuration, it's often handy
 to make them available in both the configuration and run phases. This is what the Constant recipe
 is for.
 
@@ -317,7 +317,7 @@ Let's take a look at how we would create a very simple component via the directi
 on the `planetName` constant we've just defined and displays the planet name, in our case:
 "Planet Name: Greasy Giant".
 
-Since the directives are registered via Factory recipe, we can use the same syntax as with factories.
+Since the directives are registered via the Factory recipe, we can use the same syntax as with factories.
 
 ```javascript
 myApp.directive('myPlanet', ['planetName', function myPlanetDirectiveFactory(planetName) {
@@ -340,7 +340,7 @@ We can then use the component like this:
 </html>
 ```
 
-Using Factory recipes you can also define Angular's filters and animations, but the controllers
+Using Factory recipes, you can also define Angular'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:
@@ -351,7 +351,7 @@ myApp.controller('DemoController', ['clientId', function DemoController(clientId
 }]);
 ```
 
-The DemoController is instantiated via its constructor every time the app needs an instance of
+The DemoController is instantiated via its constructor, every time the app needs an instance of
 DemoController (in our simple app it's just once). So unlike services, controllers are not
 singletons. The constructor is called with all the requested services, in our case the `clientId`
 service.
@@ -365,12 +365,12 @@ To wrap it up, let's summarize the most important points:
 - There are five recipe types that define how to create objects: Value, Factory, Service, Provider
   and Constant.
 - Factory and Service are the most commonly used recipes. The only difference between them is that
-  Service recipe works better for objects of custom type, while Factory can produce JavaScript
+  the Service recipe works better for objects of a custom type, while the Factory can produce JavaScript
   primitives and functions.
 - The Provider recipe is the core recipe type and all the other ones are just syntactic sugar on it.
 - Provider is the most complex recipe type. You don't need it unless you are building a reusable
   piece of code that needs global configuration.
-- All special purpose objects except for Controller are defined via Factory recipes.
+- All special purpose objects except for the Controller are defined via Factory recipes.
 
 <table class="table table-bordered code-table">
 <thead>
@@ -409,7 +409,15 @@ To wrap it up, let's summarize the most important points:
   <td class="success">yes\*\*</td>
 </tr>
 <tr>
-  <td>can create functions/primitives</td>
+  <td>can create functions</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+</tr>
+<tr>
+  <td>can create primitives</td>
   <td class="success">yes</td>
   <td class="error">no</td>
   <td class="success">yes</td>

docs/content/guide/scope.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Scopes
+@sortOrder 240
 @description
 
 # What are Scopes?

docs/content/guide/services.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Services
+@sortOrder 230
 @description
 
 # Services

docs/content/guide/templates.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Templates
+@sortOrder 260
 @description
 
 In Angular, templates are written with HTML that contains Angular-specific elements and attributes.

docs/content/guide/unit-testing.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Unit Testing
+@sortOrder 410
 @description
 
 JavaScript is a dynamically typed language which comes with great power of expression, but it also

docs/content/tutorial/step_02.ngdoc

@@ -250,6 +250,8 @@ browser is limited, which results in your karma tests running extremely slow.
             <tr><th>row number</th></tr>
             <tr ng-repeat="i in [0, 1, 2, 3, 4, 5, 6, 7]"><td>{{i+1}}</td></tr>
           </table>
+  
+  Extra points: try and make an 8x8 table using an additional ng-repeat.
 
 * Make the unit test fail by changing `expect(scope.phones.length).toBe(3)` to instead use `toBe(4)`.
 

docs/content/tutorial/step_05.ngdoc

@@ -166,7 +166,7 @@ Because we started using dependency injection and our controller has dependencie
 controller in our tests is a bit more complicated. We could use the `new` operator and provide the
 constructor with some kind of fake `$http` implementation. However, Angular provides a mock `$http`
 service that we can use in unit tests.  We configure "fake" responses to server requests by calling
-methods on a service called $httpBackend:
+methods on a service called `$httpBackend`:
 
 ```js
 describe('PhoneCat controllers', function() {

docs/content/tutorial/step_07.ngdoc

@@ -26,15 +26,16 @@ We are using [Bower][bower] to install client side dependencies.  This step upda
 
 ```json
 {
-  "name": "angular-seed",
+  "name": "angular-phonecat",
   "description": "A starter project for AngularJS",
   "version": "0.0.0",
-  "homepage": "https://github.com/angular/angular-seed",
+  "homepage": "https://github.com/angular/angular-phonecat",
   "license": "MIT",
   "private": true,
   "dependencies": {
     "angular": "1.2.x",
     "angular-mocks": "~1.2.x",
+    "jquery": "1.10.2",
     "bootstrap": "~3.1.1",
     "angular-route": "~1.2.x"
   }

docs/content/tutorial/step_11.ngdoc

@@ -49,8 +49,15 @@ and install this dependency. We can do this by running:
 npm install
 ```
 
+<div class="alert alert-warning">
+  **Warning:** If a new version of Angular has been released since you last ran `npm install`, then you may have a
+  problem with the `bower install` due to a conflict between the versions of angular.js that need to
+  be installed.  If you get this then simply delete your `app/bower_components` folder before running
+  `npm install`.
+</div>
+
 <div class="alert alert-info">
-  If you have bower installed globally then you can run `bower install` but for this project we have
+  **Note:** If you have bower installed globally then you can run `bower install` but for this project we have
   preconfigured `npm install` to run bower for us.
 </div>
 

docs/content/tutorial/step_12.ngdoc

@@ -59,8 +59,15 @@ We must ask bower to download and install this dependency. We can do this by run
 npm install
 ```
 
+<div class="alert alert-warning">
+  **Warning:** If a new version of Angular has been released since you last ran `npm install`, then you may have a
+  problem with the `bower install` due to a conflict between the versions of angular.js that need to
+  be installed.  If you get this then simply delete your `app/bower_components` folder before running
+  `npm install`.
+</div>
+
 <div class="alert alert-info">
-  If you have bower installed globally then you can run `bower install` but for this project we have
+  **Note:** If you have bower installed globally then you can run `bower install` but for this project we have
   preconfigured `npm install` to run bower for us.
 </div>
 

docs/docs.config.js

@@ -1,185 +0,0 @@
-var path = require('canonical-path');
-var versionInfo = require('../lib/versions/version-info');
-var basePath = __dirname;
-
-var basePackage = require('./config');
-
-module.exports = function(config) {
-
-  var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + versionInfo.cdnVersion;
-
-  var getVersion = function(component, sourceFolder, packageFile) {
-    sourceFolder = sourceFolder || '../bower_components';
-    packageFile = packageFile || 'bower.json';
-    return require(path.join(sourceFolder,component,packageFile)).version;
-  };
-
-
-  config = basePackage(config);
-
-  config.set('source.projectPath', path.resolve(basePath, '..'));
-
-  config.set('source.files', [
-    { pattern: 'src/**/*.js', basePath: path.resolve(basePath,'..') },
-    { pattern: '**/*.ngdoc', basePath: path.resolve(basePath, 'content') }
-  ]);
-
-  config.set('processing.stopOnError', true);
-
-  config.set('processing.errors.minerrInfoPath', path.resolve(basePath, '../build/errors.json'));
-
-  config.set('rendering.outputFolder', '../build/docs');
-  config.set('rendering.contentsFolder', 'partials');
-
-  config.set('logging.level', 'info');
-
-  config.merge('deployment', {
-    environments: [{
-      name: 'debug',
-      examples: {
-        commonFiles: {
-          scripts: [ '../../../angular.js' ]
-        },
-        dependencyPath: '../../../'
-      },
-      scripts: [
-        '../angular.js',
-        '../angular-resource.js',
-        '../angular-route.js',
-        '../angular-cookies.js',
-        '../angular-sanitize.js',
-        '../angular-touch.js',
-        '../angular-animate.js',
-        'components/marked-' + getVersion('marked', '../node_modules', 'package.json') + '/lib/marked.js',
-        'js/angular-bootstrap/bootstrap.js',
-        'js/angular-bootstrap/bootstrap-prettify.js',
-        'js/angular-bootstrap/dropdown-toggle.js',
-        'components/lunr.js-' + getVersion('lunr.js') + '/lunr.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
-        'js/versions-data.js',
-        'js/pages-data.js',
-        'js/docs.js'
-      ],
-      stylesheets: [
-        'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css',
-        'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
-        'css/prettify-theme.css',
-        'css/docs.css',
-        'css/animations.css'
-      ]
-    },
-    {
-      name: 'default',
-      examples: {
-        commonFiles: {
-          scripts: [ '../../../angular.min.js' ]
-        },
-        dependencyPath: '../../../'
-      },
-      scripts: [
-        '../angular.min.js',
-        '../angular-resource.min.js',
-        '../angular-route.min.js',
-        '../angular-cookies.min.js',
-        '../angular-sanitize.min.js',
-        '../angular-touch.min.js',
-        '../angular-animate.min.js',
-        'components/marked-' + getVersion('marked', '../node_modules', 'package.json') + '/lib/marked.js',
-        'js/angular-bootstrap/bootstrap.js',
-        'js/angular-bootstrap/bootstrap-prettify.js',
-        'js/angular-bootstrap/dropdown-toggle.js',
-        'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
-        'js/versions-data.js',
-        'js/pages-data.js',
-        'js/docs.js'
-      ],
-      stylesheets: [
-        'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
-        'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
-        'css/prettify-theme.css',
-        'css/docs.css',
-        'css/animations.css'
-      ]
-    },
-    {
-      name: 'jquery',
-      examples: {
-        commonFiles: {
-          scripts: [
-            '../../components/jquery-' + getVersion('jquery') + '/jquery.js',
-            '../../../angular.js'
-          ]
-        },
-        dependencyPath: '../../../'
-      },
-      scripts: [
-        'components/jquery-' + getVersion('jquery') + '/jquery.js',
-        '../angular.min.js',
-        '../angular-resource.min.js',
-        '../angular-route.min.js',
-        '../angular-cookies.min.js',
-        '../angular-sanitize.min.js',
-        '../angular-touch.min.js',
-        '../angular-animate.min.js',
-        'components/marked-' + getVersion('marked', '../node_modules', 'package.json') + '/lib/marked.js',
-        'js/angular-bootstrap/bootstrap.js',
-        'js/angular-bootstrap/bootstrap-prettify.js',
-        'js/angular-bootstrap/dropdown-toggle.js',
-        'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
-        'js/versions-data.js',
-        'js/pages-data.js',
-        'js/docs.js'
-      ],
-      stylesheets: [
-        'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
-        'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
-        'css/prettify-theme.css',
-        'css/docs.css',
-        'css/animations.css'
-      ]
-    },
-    {
-      name: 'production',
-      examples: {
-        commonFiles: {
-          scripts: [ cdnUrl + '/angular.min.js' ]
-        },
-        dependencyPath: cdnUrl + '/'
-      },
-      scripts: [
-        cdnUrl + '/angular.min.js',
-        cdnUrl + '/angular-resource.min.js',
-        cdnUrl + '/angular-route.min.js',
-        cdnUrl + '/angular-cookies.min.js',
-        cdnUrl + '/angular-sanitize.min.js',
-        cdnUrl + '/angular-touch.min.js',
-        cdnUrl + '/angular-animate.min.js',
-        'components/marked-' + getVersion('marked', '../node_modules', 'package.json') + '/lib/marked.js',
-        'js/angular-bootstrap/bootstrap.js',
-        'js/angular-bootstrap/bootstrap-prettify.js',
-        'js/angular-bootstrap/dropdown-toggle.js',
-        'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
-        'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
-        'js/versions-data.js',
-        'js/pages-data.js',
-        'js/docs.js'
-      ],
-      stylesheets: [
-        'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
-        'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
-        'css/prettify-theme.css',
-        'css/docs.css',
-        'css/animations.css'
-      ]
-    }
-  ]
-  });
-
-  return config;
-};

docs/gulpfile.js

@@ -1,8 +1,11 @@
+"use strict";
+
 var gulp = require('gulp');
+var log = require('gulp-util').log;
 var concat = require('gulp-concat');
 var jshint = require('gulp-jshint');
 var bower = require('bower');
-var dgeni = require('dgeni');
+var Dgeni = require('dgeni');
 var merge = require('event-stream').merge;
 var path = require('canonical-path');
 
@@ -12,7 +15,7 @@ var path = require('canonical-path');
 // See clean and bower for async tasks, and see assets and doc-gen for dependent tasks below
 
 var outputFolder = '../build/docs';
-var bowerFolder = '../bower_components';
+var bowerFolder = 'bower_components';
 
 
 var copyComponent = function(component, pattern, sourceFolder, packageFile) {
@@ -26,7 +29,14 @@ var copyComponent = function(component, pattern, sourceFolder, packageFile) {
 };
 
 gulp.task('bower', function() {
-  return bower.commands.install();
+  var bowerTask = bower.commands.install();
+  bowerTask.on('log', function (result) {
+    log('bower:', result.id, result.data.endpoint.name);
+  });
+  bowerTask.on('error', function(error) {
+    log(error);
+  });
+  return bowerTask;
 });
 
 gulp.task('build-app', function() {
@@ -48,12 +58,11 @@ gulp.task('assets', ['bower'], function() {
 });
 
 
-gulp.task('doc-gen', function() {
-  var generateDocs = dgeni.generator('docs.config.js');
-  return generateDocs()
-    .catch(function(error) {
-      process.exit(1);
-    });
+gulp.task('doc-gen', ['bower'], function() {
+  var dgeni = new Dgeni([require('./config')]);
+  return dgeni.generate().catch(function(error) {
+    process.exit(1);
+  });
 });
 
 // JSHint the example and protractor test files

docs/protractor-conf.js

@@ -0,0 +1,13 @@
+'use strict';
+
+var config = require('../protractor-shared-conf').config;
+
+config.specs = [
+  'app/e2e/**/*.scenario.js'
+];
+
+config.capabilities = {
+  browserName: 'chrome',
+};
+
+exports.config = config;

i18n/closure/currencySymbols.js

@@ -33,6 +33,8 @@
 
 
 goog.provide('goog.i18n.currency');
+goog.provide('goog.i18n.currency.CurrencyInfo');
+goog.provide('goog.i18n.currency.CurrencyInfoTier2');
 
 
 /**
@@ -46,7 +48,7 @@ goog.i18n.currency.PRECISION_MASK_ = 0x07;
  * Whether the currency sign should be positioned after the number.
  * @private
  */
-goog.i18n.currency.POSITION_FLAG_ = 0x08;
+goog.i18n.currency.POSITION_FLAG_ = 0x10;
 
 
 /**
@@ -56,6 +58,13 @@ goog.i18n.currency.POSITION_FLAG_ = 0x08;
 goog.i18n.currency.SPACE_FLAG_ = 0x20;
 
 
+/**
+ * Whether tier2 was enabled already by calling addTier2Support().
+ * @private
+ */
+goog.i18n.currency.tier2Enabled_ = false;
+
+
 /**
  * This function will add tier2 currency support. Be default, only tier1
  * (most popular currencies) are supported. If an application really needs
@@ -63,9 +72,13 @@ goog.i18n.currency.SPACE_FLAG_ = 0x20;
  * before any other functions in this namespace.
  */
 goog.i18n.currency.addTier2Support = function() {
-  for (var key in goog.i18n.currency.CurrencyInfoTier2) {
-    goog.i18n.currency.CurrencyInfo[key] =
-        goog.i18n.currency.CurrencyInfoTier2[key];
+  // Protection from executing this these again and again.
+  if (!goog.i18n.currency.tier2Enabled_) {
+    for (var key in goog.i18n.currency.CurrencyInfoTier2) {
+      goog.i18n.currency.CurrencyInfo[key] =
+          goog.i18n.currency.CurrencyInfoTier2[key];
+    }
+    goog.i18n.currency.tier2Enabled_ = true;
   }
 };
 
@@ -244,7 +257,7 @@ goog.i18n.currency.adjustPrecision = function(pattern, currencyCode) {
  * the currency sign should be positioned after the number. Valid values are 0
  * (before the number) or 16 (after the number). The space flag indicates
  * whether a space should be inserted between the currency sign and number.
- * Valid values are 0 (no space) and 24 (space).
+ * Valid values are 0 (no space) and 32 (space).
  *
  * The number in the array is calculated by adding together the mask and flag
  * values. For example:
@@ -252,52 +265,67 @@ goog.i18n.currency.adjustPrecision = function(pattern, currencyCode) {
  * 0: no precision (0), currency sign first (0), no space (0)
  * 2: two decimals precision (2), currency sign first (0), no space (0)
  * 18: two decimals precision (2), currency sign last (16), no space (0)
- * 42: two decimals precision (2), currency sign last (16), space (24)
+ * 50: two decimals precision (2), currency sign last (16), space (32)
  *
  * @type {!Object.<!Array>}
  */
 goog.i18n.currency.CurrencyInfo = {
   'AED': [2, 'dh', '\u062f.\u0625.', 'DH'],
+  'ALL': [0, 'Lek', 'Lek'],
   'AUD': [2, '$', 'AU$'],
   'BDT': [2, '\u09F3', 'Tk'],
+  'BGN': [2, 'lev', 'lev'],
   'BRL': [2, 'R$', 'R$'],
   'CAD': [2, '$', 'C$'],
+  'CDF': [2, 'FrCD', 'CDF'],
   'CHF': [2, 'CHF', 'CHF'],
   'CLP': [0, '$', 'CL$'],
   'CNY': [2, '¥', 'RMB¥'],
   'COP': [0, '$', 'COL$'],
   'CRC': [0, '\u20a1', 'CR\u20a1'],
-  'CZK': [2, 'K\u010d', 'K\u010d'],
+  'CZK': [50, 'K\u010d', 'K\u010d'],
   'DKK': [18, 'kr', 'kr'],
   'DOP': [2, '$', 'RD$'],
   'EGP': [2, '£', 'LE'],
-  'EUR': [18, '€', '€'],
+  'ETB': [2, 'Birr', 'Birr'],
+  'EUR': [2, '€', '€'],
   'GBP': [2, '£', 'GB£'],
   'HKD': [2, '$', 'HK$'],
+  'HRK': [2, 'kn', 'kn'],
+  'HUF': [0, 'Ft', 'Ft'],
+  'IDR': [0, 'Rp', 'Rp'],
   'ILS': [2, '\u20AA', 'IL\u20AA'],
   'INR': [2, '\u20B9', 'Rs'],
+  'IRR': [0, 'Rial', 'IRR'],
   'ISK': [0, 'kr', 'kr'],
   'JMD': [2, '$', 'JA$'],
   'JPY': [0, '¥', 'JP¥'],
   'KRW': [0, '\u20A9', 'KR₩'],
   'LKR': [2, 'Rs', 'SLRs'],
+  'LTL': [2, 'Lt', 'Lt'],
+  'LVL': [2, 'Ls', 'Ls'],
   'MNT': [0, '\u20AE', 'MN₮'],
   'MXN': [2, '$', 'Mex$'],
   'MYR': [2, 'RM', 'RM'],
-  'NOK': [18, 'kr', 'NOkr'],
+  'NOK': [50, 'kr', 'NOkr'],
   'PAB': [2, 'B/.', 'B/.'],
   'PEN': [2, 'S/.', 'S/.'],
   'PHP': [2, '\u20B1', 'Php'],
   'PKR': [0, 'Rs', 'PKRs.'],
-  'RUB': [42, 'руб.', 'руб.'],
+  'PLN': [50, 'z\u0142', 'z\u0142'],
+  'RON': [2, 'RON', 'RON'],
+  'RSD': [0, 'din', 'RSD'],
+  'RUB': [50, 'руб.', 'руб.'],
   'SAR': [2, 'Rial', 'Rial'],
   'SEK': [2, 'kr', 'kr'],
   'SGD': [2, '$', 'S$'],
   'THB': [2, '\u0e3f', 'THB'],
   'TRY': [2, 'TL', 'YTL'],
   'TWD': [2, 'NT$', 'NT$'],
+  'TZS': [0, 'TSh', 'TSh'],
+  'UAH': [2, '\u20B4', 'UAH'],
   'USD': [2, '$', 'US$'],
-  'UYU': [2, '$', 'UY$'],
+  'UYU': [2, '$', '$U'],
   'VND': [0, '\u20AB', 'VN\u20AB'],
   'YER': [0, 'Rial', 'Rial'],
   'ZAR': [2, 'R', 'ZAR']
@@ -309,16 +337,14 @@ goog.i18n.currency.CurrencyInfo = {
  * @type {!Object.<!Array>}
  */
 goog.i18n.currency.CurrencyInfoTier2 = {
-  'AFN': [16, 'Af.', 'AFN'],
-  'ALL': [0, 'Lek', 'Lek'],
+  'AFN': [48, 'Af.', 'AFN'],
   'AMD': [0, 'Dram', 'dram'],
   'AOA': [2, 'Kz', 'Kz'],
   'ARS': [2, '$', 'AR$'],
   'AWG': [2, 'Afl.', 'Afl.'],
   'AZN': [2, 'man.', 'man.'],
-  'BAM': [18, 'KM', 'KM'],
+  'BAM': [2, 'KM', 'KM'],
   'BBD': [2, '$', 'Bds$'],
-  'BGN': [2, 'lev', 'lev'],
   'BHD': [3, 'din', 'din'],
   'BIF': [0, 'FBu', 'FBu'],
   'BMD': [2, '$', 'BD$'],
@@ -329,14 +355,12 @@ goog.i18n.currency.CurrencyInfoTier2 = {
   'BWP': [2, 'P', 'pula'],
   'BYR': [0, 'BYR', 'BYR'],
   'BZD': [2, '$', 'BZ$'],
-  'CDF': [2, 'FrCD', 'CDF'],
   'CUC': [1, '$', 'CUC$'],
   'CUP': [2, '$', 'CU$'],
   'CVE': [2, 'CVE', 'Esc'],
   'DJF': [0, 'Fdj', 'Fdj'],
   'DZD': [2, 'din', 'din'],
   'ERN': [2, 'Nfk', 'Nfk'],
-  'ETB': [2, 'Birr', 'Birr'],
   'FJD': [2, '$', 'FJ$'],
   'FKP': [2, '£', 'FK£'],
   'GEL': [2, 'GEL', 'GEL'],
@@ -347,12 +371,8 @@ goog.i18n.currency.CurrencyInfoTier2 = {
   'GTQ': [2, 'Q', 'GTQ'],
   'GYD': [0, '$', 'GY$'],
   'HNL': [2, 'L', 'HNL'],
-  'HRK': [2, 'kn', 'kn'],
   'HTG': [2, 'HTG', 'HTG'],
-  'HUF': [0, 'Ft', 'Ft'],
-  'IDR': [0, 'Rp', 'Rp'],
   'IQD': [0, 'din', 'IQD'],
-  'IRR': [0, 'Rial', 'IRR'],
   'JOD': [3, 'din', 'JOD'],
   'KES': [2, 'Ksh', 'Ksh'],
   'KGS': [2, 'KGS', 'KGS'],
@@ -366,8 +386,6 @@ goog.i18n.currency.CurrencyInfoTier2 = {
   'LBP': [0, 'L£', 'LBP'],
   'LRD': [2, '$', 'L$'],
   'LSL': [2, 'LSL', 'LSL'],
-  'LTL': [2, 'Lt', 'Lt'],
-  'LVL': [2, 'Ls', 'Ls'],
   'LYD': [3, 'din', 'LD'],
   'MAD': [2, 'dh', 'MAD'],
   'MDL': [2, 'MDL', 'MDL'],
@@ -386,11 +404,8 @@ goog.i18n.currency.CurrencyInfoTier2 = {
   'NZD': [2, '$', 'NZ$'],
   'OMR': [3, 'Rial', 'OMR'],
   'PGK': [2, 'PGK', 'PGK'],
-  'PLN': [2, 'z\u0142', 'z\u0142'],
   'PYG': [0, 'Gs', 'PYG'],
   'QAR': [2, 'Rial', 'QR'],
-  'RON': [2, 'RON', 'RON'],
-  'RSD': [0, 'din', 'RSD'],
   'RWF': [0, 'RF', 'RF'],
   'SBD': [2, '$', 'SI$'],
   'SCR': [2, 'SCR', 'SCR'],
@@ -400,16 +415,13 @@ goog.i18n.currency.CurrencyInfoTier2 = {
   'SOS': [0, 'SOS', 'SOS'],
   'SRD': [2, '$', 'SR$'],
   'STD': [0, 'Db', 'Db'],
-  'SYP': [16, '£', 'SY£'],
+  'SYP': [0, '£', 'SY£'],
   'SZL': [2, 'SZL', 'SZL'],
   'TJS': [2, 'Som', 'TJS'],
   'TND': [3, 'din', 'DT'],
   'TOP': [2, 'T$', 'T$'],
   'TTD': [2, '$', 'TT$'],
-  'TZS': [0, 'TSh', 'TSh'],
-  'UAH': [2, '\u20B4', 'UAH'],
   'UGX': [0, 'UGX', 'UGX'],
-  'UYU': [1, '$', '$U'],
   'UZS': [0, 'so\u02bcm', 'UZS'],
   'VEF': [2, 'Bs', 'Bs'],
   'VUV': [0, 'VUV', 'VUV'],

i18n/src/closureSlurper.js

@@ -22,7 +22,12 @@ function readSymbols() {
     .then(function(content) {
       var currencySymbols = closureI18nExtractor.extractCurrencySymbols(content);
       return qfs.read(__dirname + '/../closure/numberSymbols.js', 'b').then(function(content) {
-          closureI18nExtractor.extractNumberSymbols(content, localeInfo, currencySymbols);
+          var numberSymbols = content;
+          return qfs.read(__dirname + '/../closure/numberSymbolsExt.js', 'b')
+            .then(function(content) {
+              numberSymbols += content;
+              return closureI18nExtractor.extractNumberSymbols(numberSymbols, localeInfo, currencySymbols);
+            });
         });
       });
 

i18n/src/parser.js

@@ -18,7 +18,7 @@ function parsePattern(pattern) {
   var p = {
             minInt: 1,
             minFrac: 0,
-            macFrac: 0,
+            maxFrac: 0,
             posPre: '',
             posSuf: '',
             negPre: '',

i18n/update-closure.sh

@@ -14,4 +14,5 @@ curl "$I18N_BASE/currency.js" > closure/currencySymbols.js
 curl "$I18N_BASE/datetimesymbols.js" > closure/datetimeSymbols.js
 curl "$I18N_BASE/datetimesymbolsext.js" > closure/datetimeSymbolsExt.js
 curl "$I18N_BASE/numberformatsymbols.js" > closure/numberSymbols.js
+curl "$I18N_BASE/numberformatsymbolsext.js" > closure/numberSymbolsExt.js
 curl "$I18N_BASE/pluralrules.js" > closure/pluralRules.js

package.json

@@ -6,11 +6,20 @@
     "url": "https://github.com/angular/angular.js.git"
   },
   "devDependencies": {
+    "angular-benchpress": "0.x.x",
+    "benchmark": "1.x.x",
+    "bower": "~1.3.9",
+    "browserstacktunnel-wrapper": "~1.1.1",
+    "canonical-path": "0.0.2",
+    "dgeni": "^0.4.0",
+    "dgeni-packages": "^0.10.0",
+    "es6-shim": "^0.14.0",
+    "event-stream": "~3.1.0",
     "grunt": "~0.4.2",
     "grunt-bump": "~0.0.13",
     "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-connect": "~0.5.0",
     "grunt-contrib-compress": "~0.5.2",
+    "grunt-contrib-connect": "~0.5.0",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-ddescribe-iit": "~0.0.1",
@@ -19,41 +28,38 @@
     "grunt-merge-conflict": "~0.0.1",
     "grunt-parallel": "~0.3.1",
     "grunt-shell": "~0.4.0",
-    "load-grunt-tasks": "~0.3.0",
-    "bower": "~1.2.2",
+    "gulp": "~3.8.0",
+    "gulp-concat": "~2.1.7",
+    "gulp-jshint": "~1.4.2",
+    "gulp-util": "^3.0.1",
     "jasmine-node": "~1.11.0",
-    "q": "~1.0.0",
-    "shelljs": "~0.2.6",
+    "jasmine-reporters": "~0.2.1",
+    "jshint-stylish": "~0.1.5",
     "karma": "^0.12.0",
-    "karma-jasmine": "0.1.5",
+    "karma-browserstack-launcher": "0.0.7",
     "karma-chrome-launcher": "0.1.2",
     "karma-firefox-launcher": "0.1.3",
-    "karma-ng-scenario": "0.1.0",
+    "karma-jasmine": "0.1.5",
     "karma-junit-reporter": "0.2.1",
+    "karma-ng-scenario": "0.1.0",
     "karma-sauce-launcher": "0.2.0",
     "karma-script-launcher": "0.1.0",
-    "karma-browserstack-launcher": "0.0.7",
-    "protractor": "1.0.0",
-    "yaml-js": "~0.0.8",
-    "rewire": "1.1.3",
-    "promises-aplus-tests": "~1.3.2",
-    "semver": "~2.1.0",
+    "load-grunt-tasks": "~0.3.0",
     "lodash": "~2.1.0",
-    "browserstacktunnel-wrapper": "~1.1.1",
-    "jasmine-reporters": "~0.2.1",
-    "gulp": "~3.4.0",
-    "event-stream": "~3.1.0",
     "marked": "~0.3.0",
-    "gulp-concat": "~2.1.7",
-    "canonical-path": "0.0.2",
-    "winston": "~0.7.2",
-    "dgeni": "^0.3.0",
-    "dgeni-packages": "^0.9.7",
-    "gulp-jshint": "~1.4.2",
-    "jshint-stylish": "~0.1.5",
     "node-html-encoder": "0.0.2",
+    "promises-aplus-tests": "~1.3.2",
+    "protractor": "1.2.0",
+    "q": "~1.0.0",
+    "q-io": "^1.10.9",
+    "qq": "^0.3.5",
+    "rewire": "1.1.3",
+    "semver": "~2.1.0",
+    "shelljs": "~0.2.6",
     "sorted-object": "^1.0.0",
-    "qq": "^0.3.5"
+    "stringmap": "^0.2.2",
+    "winston": "~0.7.2",
+    "yaml-js": "~0.0.8"
   },
   "licenses": [
     {

protractor-conf.js

@@ -4,7 +4,7 @@ var config = require('./protractor-shared-conf').config;
 
 config.specs = [
   'build/docs/ptore2e/**/*.js',
-  'docs/app/e2e/docsAppE2E.js'
+  'docs/app/e2e/**/*.scenario.js'
 ];
 
 config.capabilities = {

protractor-jenkins-conf.js

@@ -5,7 +5,7 @@ exports.config = {
 
   specs: [
     'build/docs/ptore2e/**/*.js',
-    'docs/app/e2e/docsAppE2E.js'
+    'docs/app/e2e/*.scenario.js'
   ],
 
   capabilities: {

scripts/clean-shrinkwrap.js

@@ -23,9 +23,6 @@ function cleanModule(module, name) {
   if (name === 'chokidar') {
     if (module.version === '0.8.1') {
       delete module.dependencies;
-    } else if ( module.version !== '0.8.2') {
-      throw new Error("Unfamiliar chokidar version (v" + module.version +
-          ") , please check status of https://github.com/paulmillr/chokidar/pull/106");
     }
   }
 

scripts/travis/build.sh

@@ -9,12 +9,11 @@ if [ $JOB = "unit" ]; then
   grunt test:promises-aplus
   grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
   grunt tests:docs --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
+  grunt test:travis-protractor --specs "docs/app/e2e/**/*.scenario.js"
 elif [ $JOB = "e2e" ]; then
-  export TARGET_SPECS="build/docs/ptore2e/**/*jqlite_test.js"
+  export TARGET_SPECS="build/docs/ptore2e/**/default_test.js"
   if [ $TEST_TARGET = "jquery" ]; then
-    TARGET_SPECS="build/docs/ptore2e/**/*jquery_test.js"
-  elif [ $TEST_TARGET = "doce2e" ]; then
-    TARGET_SPECS="docs/app/e2e/docsAppE2E.js"
+    TARGET_SPECS="build/docs/ptore2e/**/jquery_test.js"
   fi
   grunt test:travis-protractor --specs "$TARGET_SPECS"
 else

src/ng/browser.js

@@ -234,6 +234,13 @@ function Browser(window, document, $log, $sniffer) {
     return callback;
   };
 
+  /**
+   * Checks whether the url has changed outside of Angular.
+   * Needs to be exported to be able to check for changes that have been done in sync,
+   * as hashchange/popstate events fire in async.
+   */
+  self.$$checkUrlChange = fireUrlChange;
+
   //////////////////////////////////////////////////////////////
   // Misc API
   //////////////////////////////////////////////////////////////

src/ng/directive/form.js

@@ -70,8 +70,9 @@ function FormController(element, attrs, $scope, $animate) {
   // convenience method for easy toggling of classes
   function toggleValidCss(isValid, validationErrorKey) {
     validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-    $animate.removeClass(element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
-    $animate.addClass(element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
+    $animate.setClass(element,
+      (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey,
+      (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
   }
 
   /**
@@ -286,8 +287,6 @@ function FormController(element, attrs, $scope, $animate) {
  * hitting enter in any of the input fields will trigger the click handler on the *first* button or
  * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
  *
- * @param {string=} name Name of the form. If specified, the form controller will be published into
- *                       related scope, under this name.
  *
  * ## Animation Hooks
  *
@@ -365,6 +364,8 @@ function FormController(element, attrs, $scope, $animate) {
       </file>
     </example>
  *
+ * @param {string=} name Name of the form. If specified, the form controller will be published into
+ *                       related scope, under this name.
  */
 var formDirectiveFactory = function(isNgForm) {
   return ['$timeout', function($timeout) {

src/ng/directive/input.js

@@ -522,7 +522,7 @@ function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
     // a row.
     var revalidate = validity && ctrl.$$hasNativeValidators;
     if (ctrl.$viewValue !== value || (value === '' && revalidate)) {
-      if (scope.$$phase) {
+      if (scope.$root.$$phase) {
         ctrl.$setViewValue(value);
       } else {
         scope.$apply(function() {

src/ng/directive/ngEventDirs.js

@@ -19,7 +19,9 @@
       <button ng-click="count = count + 1" ng-init="count=0">
         Increment
       </button>
-      count: {{count}}
+      <span>
+        count: {{count}}
+      <span>
      </file>
      <file name="protractor.js" type="protractor">
        it('should check ng-click', function() {
@@ -37,19 +39,32 @@
  * Events that are handled via these handler are always configured not to propagate further.
  */
 var ngEventDirectives = {};
+
+// For events that might fire synchronously during DOM manipulation
+// we need to execute their event handlers asynchronously using $evalAsync,
+// so that they are not executed in an inconsistent state.
+var forceAsyncEvents = {
+  'blur': true,
+  'focus': true
+};
 forEach(
   'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
-  function(name) {
-    var directiveName = directiveNormalize('ng-' + name);
-    ngEventDirectives[directiveName] = ['$parse', function($parse) {
+  function(eventName) {
+    var directiveName = directiveNormalize('ng-' + eventName);
+    ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
       return {
         compile: function($element, attr) {
           var fn = $parse(attr[directiveName]);
           return function ngEventHandler(scope, element) {
-            element.on(lowercase(name), function(event) {
-              scope.$apply(function() {
+            element.on(eventName, function(event) {
+              var callback = function() {
                 fn(scope, {$event:event});
-              });
+              };
+              if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+                scope.$evalAsync(callback);
+              } else {
+                scope.$apply(callback);
+              }
             });
           };
         }
@@ -366,6 +381,10 @@ forEach(
  * @description
  * Specify custom behavior on focus event.
  *
+ * Note: As the `focus` event is executed synchronously when calling `input.focus()`
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
  * @element window, input, select, textarea, a
  * @priority 0
  * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
@@ -382,6 +401,14 @@ forEach(
  * @description
  * Specify custom behavior on blur event.
  *
+ * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
+ * an element has lost focus.
+ *
+ * Note: As the `blur` event is executed synchronously also during DOM manipulations
+ * (e.g. removing a focussed input),
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
  * @element window, input, select, textarea, a
  * @priority 0
  * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon

src/ng/directive/ngRepeat.js

@@ -309,8 +309,9 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
                if (block && block.scope) lastBlockMap[block.id] = block;
              });
              // This is a duplicate and we need to throw an error
-             throw ngRepeatMinErr('dupes', "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}",
-                                                                                                                                                    expression,       trackById);
+             throw ngRepeatMinErr('dupes',
+                  "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",
+                  expression, trackById, toJson(value));
            } else {
              // new never before seen block
              nextBlockOrder[index] = { id: trackById };

src/ng/directive/ngShowHide.js

@@ -6,8 +6,8 @@
  *
  * @description
  * The `ngShow` directive shows or hides the given HTML element based on the expression
- * provided to the ngShow attribute. The element is shown or hidden by removing or adding
- * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
+ * provided to the `ngShow` attribute. The element is shown or hidden by removing or adding
+ * the `.ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
  * in AngularJS and sets the display style to none (using an !important flag).
  * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
  *
@@ -19,8 +19,8 @@
  * <div ng-show="myValue" class="ng-hide"></div>
  * ```
  *
- * When the ngShow expression evaluates to false then the ng-hide CSS class is added to the class attribute
- * on the element causing it to become hidden. When true, the ng-hide CSS class is removed
+ * When the `ngShow` expression evaluates to false then the `.ng-hide` CSS class is added to the class attribute
+ * on the element causing it to become hidden. When true, the `.ng-hide` CSS class is removed
  * from the element causing the element not to appear hidden.
  *
  * <div class="alert alert-warning">
@@ -30,7 +30,7 @@
  *
  * ## Why is !important used?
  *
- * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
  * can be easily overridden by heavier selectors. For example, something as simple
  * as changing the display style on a HTML list item would make hidden elements appear visible.
  * This also becomes a bigger issue when dealing with CSS frameworks.
@@ -39,7 +39,7 @@
  * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
  * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
  *
- * ### Overriding .ng-hide
+ * ### Overriding `.ng-hide`
  *
  * By default, the `.ng-hide` class will style the element with `display:none!important`. If you wish to change
  * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
@@ -57,7 +57,7 @@
  *
  * By default you don't need to override in CSS anything and the animations will work around the display style.
  *
- * ## A note about animations with ngShow
+ * ## A note about animations with `ngShow`
  *
  * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
  * is true and false. This system works like the animation system present with ngClass except that
@@ -82,8 +82,8 @@
  * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
  *
  * @animations
- * addClass: .ng-hide - happens after the ngShow expression evaluates to a truthy value and the just before contents are set to visible
- * removeClass: .ng-hide - happens after the ngShow expression evaluates to a non truthy value and just before the contents are set to hidden
+ * addClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a truthy value and the just before contents are set to visible
+ * removeClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden
  *
  * @element ANY
  * @param {expression} ngShow If the {@link guide/expression expression} is truthy
@@ -163,7 +163,7 @@ var ngShowDirective = ['$animate', function($animate) {
  *
  * @description
  * The `ngHide` directive shows or hides the given HTML element based on the expression
- * provided to the ngHide attribute. The element is shown or hidden by removing or adding
+ * provided to the `ngHide` attribute. The element is shown or hidden by removing or adding
  * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
  * in AngularJS and sets the display style to none (using an !important flag).
  * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
@@ -176,8 +176,8 @@ var ngShowDirective = ['$animate', function($animate) {
  * <div ng-hide="myValue"></div>
  * ```
  *
- * When the ngHide expression evaluates to true then the .ng-hide CSS class is added to the class attribute
- * on the element causing it to become hidden. When false, the ng-hide CSS class is removed
+ * When the `.ngHide` expression evaluates to true then the `.ng-hide` CSS class is added to the class attribute
+ * on the element causing it to become hidden. When false, the `.ng-hide` CSS class is removed
  * from the element causing the element not to appear hidden.
  *
  * <div class="alert alert-warning">
@@ -187,7 +187,7 @@ var ngShowDirective = ['$animate', function($animate) {
  *
  * ## Why is !important used?
  *
- * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
  * can be easily overridden by heavier selectors. For example, something as simple
  * as changing the display style on a HTML list item would make hidden elements appear visible.
  * This also becomes a bigger issue when dealing with CSS frameworks.
@@ -196,7 +196,7 @@ var ngShowDirective = ['$animate', function($animate) {
  * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
  * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
  *
- * ### Overriding .ng-hide
+ * ### Overriding `.ng-hide`
  *
  * By default, the `.ng-hide` class will style the element with `display:none!important`. If you wish to change
  * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
@@ -214,7 +214,7 @@ var ngShowDirective = ['$animate', function($animate) {
  *
  * By default you don't need to override in CSS anything and the animations will work around the display style.
  *
- * ## A note about animations with ngHide
+ * ## A note about animations with `ngHide`
  *
  * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
  * is true and false. This system works like the animation system present with ngClass, except that the `.ng-hide`
@@ -238,8 +238,8 @@ var ngShowDirective = ['$animate', function($animate) {
  * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
  *
  * @animations
- * removeClass: .ng-hide - happens after the ngHide expression evaluates to a truthy value and just before the contents are set to hidden
- * addClass: .ng-hide - happens after the ngHide expression evaluates to a non truthy value and just before the contents are set to visible
+ * removeClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden
+ * addClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a non truthy value and just before the contents are set to visible
  *
  * @element ANY
  * @param {expression} ngHide If the {@link guide/expression expression} is truthy then

src/ng/directive/select.js

@@ -404,6 +404,19 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
         ctrl.$render = render;
 
         scope.$watchCollection(valuesFn, render);
+        scope.$watchCollection(function () {
+          var locals = {},
+              values = valuesFn(scope);
+          if (values) {
+            var toDisplay = new Array(values.length);
+            for (var i = 0, ii = values.length; i < ii; i++) {
+              locals[valueName] = values[i];
+              toDisplay[i] = displayFn(scope, locals);
+            }
+            return toDisplay;
+          }
+        }, render);
+
         if ( multiple ) {
           scope.$watchCollection(function() { return ctrl.$modelValue; }, render);
         }

src/ng/filter.js

@@ -60,16 +60,6 @@
  * For more information about how angular filters work, and how to create your own filters, see
  * {@link guide/filter Filters} in the Angular Developer Guide.
  */
-/**
- * @ngdoc method
- * @name $filterProvider#register
- * @description
- * Register filter factory function.
- *
- * @param {String} name Name of the filter.
- * @param {Function} fn The filter factory function which is injectable.
- */
-
 
 /**
  * @ngdoc service
@@ -108,7 +98,7 @@ function $FilterProvider($provide) {
 
   /**
    * @ngdoc method
-   * @name $controllerProvider#register
+   * @name $filterProvider#register
    * @param {string|Object} name Name of the filter function, or an object map of filters where
    *    the keys are the filter names and the values are the filter factories.
    * @returns {Object} Registered filter instance, or if a map of filters was provided then a map

src/ng/filter/filter.js

@@ -23,7 +23,9 @@
  *     which have property `name` containing "M" and property `phone` containing "1". A special
  *     property name `$` can be used (as in `{$:"text"}`) to accept a match against any
  *     property of the object. That's equivalent to the simple substring match with a `string`
- *     as described above.
+ *     as described above. The predicate can be negated by prefixing the string with `!`.
+ *     For Example `{name: "!M"}` predicate will return an array of items which have property `name`
+ *     not containing "M".
  *
  *   - `function(value)`: A predicate function can be used to write arbitrary filters. The function is
  *     called for each element of `array`. The final result is an array of those elements that

src/ng/filter/filters.js

@@ -153,6 +153,10 @@ function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round
     number = +(Math.round(+(number.toString() + 'e' + fractionSize)).toString() + 'e' + -fractionSize);
 
+    if (number === 0) {
+      isNegative = false;
+    }
+
     var fraction = ('' + number).split(DECIMAL_SEP);
     var whole = fraction[0];
     fraction = fraction[1] || '';
@@ -322,8 +326,8 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+
  *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 pm)
  *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 pm)
  *
- *   `format` string can contain literal values. These need to be quoted with single quotes (e.g.
- *   `"h 'in the morning'"`). In order to output single quote, use two single quotes in a sequence
+ *   `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g.
+ *   `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence
  *   (e.g. `"h 'o''clock'"`).
  *
  * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
@@ -343,6 +347,8 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+
           <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
        <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
           <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
+       <span ng-non-bindable>{{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}</span>:
+          <span>{{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
      </file>
      <file name="protractor.js" type="protractor">
        it('should format date', function() {
@@ -352,6 +358,8 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+
             toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/);
          expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
             toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
+         expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()).
+            toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/);
        });
      </file>
    </example>

src/ng/filter/orderBy.js

@@ -115,7 +115,7 @@
 orderByFilter.$inject = ['$parse'];
 function orderByFilter($parse){
   return function(array, sortPredicate, reverseOrder) {
-    if (!isArray(array)) return array;
+    if (!(isArrayLike(array))) return array;
     if (!sortPredicate) return array;
     sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate];
     sortPredicate = map(sortPredicate, function(predicate){

src/ng/http.js

@@ -1048,7 +1048,7 @@ function $HttpProvider() {
           if (isObject(v)) {
             if (isDate(v)){
               v = v.toISOString();
-            } else if (isObject(v)) {
+            } else {
               v = toJson(v);
             }
           }

src/ng/interpolate.js

@@ -221,7 +221,7 @@ function $InterpolateProvider() {
      * @description
      * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.
      *
-     * Use {@link ng.$interpolateProvider#startSymbol $interpolateProvider#startSymbol} to change
+     * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change
      * the symbol.
      *
      * @returns {string} start symbol.
@@ -237,7 +237,7 @@ function $InterpolateProvider() {
      * @description
      * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
      *
-     * Use {@link ng.$interpolateProvider#endSymbol $interpolateProvider#endSymbol} to change
+     * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change
      * the symbol.
      *
      * @returns {string} end symbol.

src/ng/location.js

@@ -320,17 +320,16 @@ LocationHashbangInHtml5Url.prototype =
    * Change path, search and hash, when called with parameter and return `$location`.
    *
    * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`)
-   * @param {string=} replace The path that will be changed
    * @return {string} url
    */
-  url: function(url, replace) {
+  url: function(url) {
     if (isUndefined(url))
       return this.$$url;
 
     var match = PATH_MATCH.exec(url);
     if (match[1]) this.path(decodeURIComponent(match[1]));
     if (match[2] || match[1]) this.search(match[3] || '');
-    this.hash(match[5] || '', replace);
+    this.hash(match[5] || '');
 
     return this;
   },
@@ -388,10 +387,11 @@ LocationHashbangInHtml5Url.prototype =
    * Note: Path should always begin with forward slash (/), this method will add the forward slash
    * if it is missing.
    *
-   * @param {string=} path New path
+   * @param {(string|number)=} path New path
    * @return {string} path
    */
   path: locationGetterSetter('$$path', function(path) {
+    path = path ? path.toString() : '';
     return path.charAt(0) == '/' ? path : '/' + path;
   }),
 
@@ -427,7 +427,7 @@ LocationHashbangInHtml5Url.prototype =
    * If the argument is a hash object containing an array of values, these values will be encoded
    * as duplicate search parameters in the url.
    *
-   * @param {(string|Array<string>|boolean)=} paramValue If `search` is a string, then `paramValue`
+   * @param {(string|Number|Array<string>|boolean)=} paramValue If `search` is a string or number, then `paramValue`
    * will override only a single search property.
    *
    * If `paramValue` is an array, it will override the property of the `search` component of
@@ -446,7 +446,8 @@ LocationHashbangInHtml5Url.prototype =
       case 0:
         return this.$$search;
       case 1:
-        if (isString(search)) {
+        if (isString(search) || isNumber(search)) {
+          search = search.toString();
           this.$$search = parseKeyValue(search);
         } else if (isObject(search)) {
           // remove object undefined or null properties
@@ -483,10 +484,12 @@ LocationHashbangInHtml5Url.prototype =
    *
    * Change hash fragment when called with parameter and return `$location`.
    *
-   * @param {string=} hash New hash fragment
+   * @param {(string|number)=} hash New hash fragment
    * @return {string} hash
    */
-  hash: locationGetterSetter('$$hash', identity),
+  hash: locationGetterSetter('$$hash', function(hash) {
+    return hash ? hash.toString() : '';
+  }),
 
   /**
    * @ngdoc method

src/ng/parse.js

@@ -753,7 +753,7 @@ Parser.prototype = {
       var context = contextGetter ? contextGetter(scope, locals) : scope;
 
       for (var i = 0; i < argsFn.length; i++) {
-        args.push(argsFn[i](scope, locals));
+        args.push(ensureSafeObject(argsFn[i](scope, locals), parser.text));
       }
       var fnPtr = fn(scope, locals, context) || noop;
 
@@ -841,13 +841,15 @@ Parser.prototype = {
 //////////////////////////////////////////////////
 
 function setter(obj, path, setValue, fullExp, options) {
+  ensureSafeObject(obj, fullExp);
+
   //needed?
   options = options || {};
 
   var element = path.split('.'), key;
   for (var i = 0; element.length > 1; i++) {
     key = ensureSafeMemberName(element.shift(), fullExp);
-    var propertyObj = obj[key];
+    var propertyObj = ensureSafeObject(obj[key], fullExp);
     if (!propertyObj) {
       propertyObj = {};
       obj[key] = propertyObj;
@@ -867,7 +869,6 @@ function setter(obj, path, setValue, fullExp, options) {
     }
   }
   key = ensureSafeMemberName(element.shift(), fullExp);
-  ensureSafeObject(obj, fullExp);
   ensureSafeObject(obj[key], fullExp);
   obj[key] = setValue;
   return setValue;

src/ng/rootScope.js

@@ -139,10 +139,26 @@ function $RootScopeProvider(){
     /**
      * @ngdoc property
      * @name $rootScope.Scope#$id
-     * @returns {number} Unique scope ID (monotonically increasing alphanumeric sequence) useful for
-     *   debugging.
+     *
+     * @description
+     * Unique scope ID (monotonically increasing) useful for debugging.
      */
 
+     /**
+      * @ngdoc property
+      * @name $rootScope.Scope#$parent
+      *
+      * @description
+      * Reference to the parent scope.
+      */
+
+      /**
+       * @ngdoc property
+       * @name $rootScope.Scope#$root
+       *
+       * @description
+       * Reference to the root scope.
+       */
 
     Scope.prototype = {
       constructor: Scope,
@@ -154,9 +170,8 @@ function $RootScopeProvider(){
        * @description
        * Creates a new child {@link ng.$rootScope.Scope scope}.
        *
-       * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} and
-       * {@link ng.$rootScope.Scope#$digest $digest()} events. The scope can be removed from the
-       * scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
+       * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event.
+       * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
        *
        * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
        * desired for the scope and its child scopes to be permanently detached from the parent and
@@ -609,6 +624,8 @@ function $RootScopeProvider(){
             logIdx, logMsg, asyncTask;
 
         beginPhase('$digest');
+        // Check for changes to browser url that happened in sync before the call to $digest
+        $browser.$$checkUrlChange();
 
         lastDirtyWatch = null;
 

src/ngLocale/angular-locale_aa-dj.js

@@ -0,0 +1,115 @@
+'use strict';
+angular.module("ngLocale", [], ["$provide", function($provide) {
+var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
+function getDecimals(n) {
+  n = n + '';
+  var i = n.indexOf('.');
+  return (i == -1) ? 0 : n.length - i - 1;
+}
+
+function getVF(n, opt_precision) {
+  var v = opt_precision;
+
+  if (undefined === v) {
+    v = Math.min(getDecimals(n), 3);
+  }
+
+  var base = Math.pow(10, v);
+  var f = ((n * base) | 0) % base;
+  return {v: v, f: f};
+}
+
+$provide.value("$locale", {
+  "DATETIME_FORMATS": {
+    "AMPMS": [
+      "saaku",
+      "carra"
+    ],
+    "DAY": [
+      "Acaada",
+      "Etleeni",
+      "Talaata",
+      "Arbaqa",
+      "Kamiisi",
+      "Gumqata",
+      "Sabti"
+    ],
+    "MONTH": [
+      "Qunxa Garablu",
+      "Kudo",
+      "Ciggilta Kudo",
+      "Agda Baxis",
+      "Caxah Alsa",
+      "Qasa Dirri",
+      "Qado Dirri",
+      "Leqeeni",
+      "Waysu",
+      "Diteli",
+      "Ximoli",
+      "Kaxxa Garablu"
+    ],
+    "SHORTDAY": [
+      "Aca",
+      "Etl",
+      "Tal",
+      "Arb",
+      "Kam",
+      "Gum",
+      "Sab"
+    ],
+    "SHORTMONTH": [
+      "Qun",
+      "Nah",
+      "Cig",
+      "Agd",
+      "Cax",
+      "Qas",
+      "Qad",
+      "Leq",
+      "Way",
+      "Dit",
+      "Xim",
+      "Kax"
+    ],
+    "fullDate": "EEEE, MMMM dd, y",
+    "longDate": "dd MMMM y",
+    "medium": "dd-MMM-y h:mm:ss a",
+    "mediumDate": "dd-MMM-y",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/yy h:mm a",
+    "shortDate": "dd/MM/yy",
+    "shortTime": "h:mm a"
+  },
+  "NUMBER_FORMATS": {
+    "CURRENCY_SYM": "Fdj",
+    "DECIMAL_SEP": ".",
+    "GROUP_SEP": ",",
+    "PATTERNS": [
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 3,
+        "minFrac": 0,
+        "minInt": 1,
+        "negPre": "-",
+        "negSuf": "",
+        "posPre": "",
+        "posSuf": ""
+      },
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 2,
+        "minFrac": 2,
+        "minInt": 1,
+        "negPre": "\u00a4-",
+        "negSuf": "",
+        "posPre": "\u00a4",
+        "posSuf": ""
+      }
+    ]
+  },
+  "id": "aa-dj",
+  "pluralCat": function (n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+});
+}]);

src/ngLocale/angular-locale_aa-er.js

@@ -0,0 +1,115 @@
+'use strict';
+angular.module("ngLocale", [], ["$provide", function($provide) {
+var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
+function getDecimals(n) {
+  n = n + '';
+  var i = n.indexOf('.');
+  return (i == -1) ? 0 : n.length - i - 1;
+}
+
+function getVF(n, opt_precision) {
+  var v = opt_precision;
+
+  if (undefined === v) {
+    v = Math.min(getDecimals(n), 3);
+  }
+
+  var base = Math.pow(10, v);
+  var f = ((n * base) | 0) % base;
+  return {v: v, f: f};
+}
+
+$provide.value("$locale", {
+  "DATETIME_FORMATS": {
+    "AMPMS": [
+      "saaku",
+      "carra"
+    ],
+    "DAY": [
+      "Acaada",
+      "Etleeni",
+      "Talaata",
+      "Arbaqa",
+      "Kamiisi",
+      "Gumqata",
+      "Sabti"
+    ],
+    "MONTH": [
+      "Qunxa Garablu",
+      "Kudo",
+      "Ciggilta Kudo",
+      "Agda Baxis",
+      "Caxah Alsa",
+      "Qasa Dirri",
+      "Qado Dirri",
+      "Liiqen",
+      "Waysu",
+      "Diteli",
+      "Ximoli",
+      "Kaxxa Garablu"
+    ],
+    "SHORTDAY": [
+      "Aca",
+      "Etl",
+      "Tal",
+      "Arb",
+      "Kam",
+      "Gum",
+      "Sab"
+    ],
+    "SHORTMONTH": [
+      "Qun",
+      "Nah",
+      "Cig",
+      "Agd",
+      "Cax",
+      "Qas",
+      "Qad",
+      "Leq",
+      "Way",
+      "Dit",
+      "Xim",
+      "Kax"
+    ],
+    "fullDate": "EEEE, MMMM dd, y",
+    "longDate": "dd MMMM y",
+    "medium": "dd-MMM-y h:mm:ss a",
+    "mediumDate": "dd-MMM-y",
+    "mediumTime": "h:mm:ss a",
+    "short": "dd/MM/yy h:mm a",
+    "shortDate": "dd/MM/yy",
+    "shortTime": "h:mm a"
+  },
+  "NUMBER_FORMATS": {
+    "CURRENCY_SYM": "Nfk",
+    "DECIMAL_SEP": ".",
+    "GROUP_SEP": ",",
+    "PATTERNS": [
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 3,
+        "minFrac": 0,
+        "minInt": 1,
+        "negPre": "-",
+        "negSuf": "",
+        "posPre": "",
+        "posSuf": ""
+      },
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 2,
+        "minFrac": 2,
+        "minInt": 1,
+        "negPre": "\u00a4-",
+        "negSuf": "",
+        "posPre": "\u00a4",
+        "posSuf": ""
+      }
+    ]
+  },
+  "id": "aa-er",
+  "pluralCat": function (n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+});
+}]);