feat($parse): allow for assignments in ternary operator branches

Closes #8512
Closes #8484
CLoses #5434

Conflicts:
	test/ng/parseSpec.js

.editorconfig

@@ -0,0 +1,21 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[src/ngLocale/**]
+insert_final_newline = false
+
+[dropdown-toggle.js]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[htmlparser.js]
+insert_final_newline = false

.jshintignore

@@ -0,0 +1,2 @@
+node_modules/**
+lib/htmlparser/**

.jshintrc

@@ -0,0 +1,5 @@
+{
+  "extends": ".jshintrc-base",
+  "node": true,
+  "globals": {}
+}

.jshintrc-base

@@ -0,0 +1,19 @@
+{
+  "bitwise": true,
+  "immed": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonew": true,
+  "trailing": true,
+  "maxlen": 200,
+  "boss": true,
+  "eqnull": true,
+  "expr": true,
+  "globalstrict": true,
+  "laxbreak": true,
+  "loopfunc": true,
+  "sub": true,
+  "undef": true,
+  "indent": 2
+}

.travis.yml

@@ -24,8 +24,8 @@ install:
   - npm config set spin false
   # Log HTTP requests
   - npm config set loglevel http
-  # Run npm install twice, because it is flaky.
-  - npm install || npm install
+  - time ./scripts/travis/npm-bundle-deps.sh
+  - time npm install
 
 before_script:
   - mkdir -p $LOGS_DIR

CHANGELOG.md

@@ -1,3 +1,307 @@
+<a name="1.3.0-beta.17"></a>
+# 1.3.0-beta.17 turing-autocompletion (2014-07-25)
+
+
+## Bug Fixes
+
+- **angular.copy:** clone regexp flags correctly
+  ([86340a59](https://github.com/angular/angular.js/commit/86340a59bf9eb7bdfc4f99000cecf628cd10d9c8),
+   [#5781](https://github.com/angular/angular.js/issues/5781), [#8337](https://github.com/angular/angular.js/issues/8337))
+- **docs:** change plnkr form to open in same window
+  ([925b2080](https://github.com/angular/angular.js/commit/925b2080a0341d9348feeb4f492957a2e2c80082))
+- **jqLite:** triggerHandler support unbind self
+  ([8a27abae](https://github.com/angular/angular.js/commit/8a27abae896de3c4d94c407e8bb381e099d2d7f7),
+   [#5984](https://github.com/angular/angular.js/issues/5984))
+- **ngHref:** remove attribute when empty value instead of ignoring
+  ([469ea338](https://github.com/angular/angular.js/commit/469ea3384ad48ca4765af807c0f41201edb527f9),
+   [#2755](https://github.com/angular/angular.js/issues/2755))
+
+
+## Features
+
+- **$compile:** change directive's restrict setting to default to EA (element/attribute)
+  ([11f5aeee](https://github.com/angular/angular.js/commit/11f5aeeee952a395edaf54e3277674f211a82fc7),
+   [#8321](https://github.com/angular/angular.js/issues/8321))
+- **$q:** add streamlined ES6-style interface for using $q
+  ([f3a763fd](https://github.com/angular/angular.js/commit/f3a763fd2edd8a37b80c79a5aaa1444460cd2df7),
+   [#8311](https://github.com/angular/angular.js/issues/8311), [#6427](https://github.com/angular/angular.js/issues/6427))
+- **ngRepeat:** provide support for aliasing filtered repeater results as a scope member
+  ([e0adb9c4](https://github.com/angular/angular.js/commit/e0adb9c452e172295209f785b62472688225fffb),
+   [#5919](https://github.com/angular/angular.js/issues/5919), [#8046](https://github.com/angular/angular.js/issues/8046), [#8282](https://github.com/angular/angular.js/issues/8282))
+
+
+## Performance Improvements
+
+- **$parse:** don't use reflective calls in generated functions
+  ([c54228fb](https://github.com/angular/angular.js/commit/c54228fbe9d42d8a3a159bf84dd1d2e99b259ece))
+
+
+## Breaking Changes
+
+- **$compile:** due to [11f5aeee](https://github.com/angular/angular.js/commit/11f5aeeee952a395edaf54e3277674f211a82fc7),
+  directives now match elements by default unless specific restriction rules are set via `restrict` property.
+
+This means that if a directive 'myFoo' previously didn't specify matching restrictrion, it will now match both the attribute
+and element form.
+
+Before:
+
+ `<div my-foo></div>` <---- my-foo attribute matched the directive
+
+ `<my-foo></my-foo>`  <---- no match
+
+After:
+
+ `<div my-foo></div>` <---- my-foo attribute matched the directive
+
+ `<my-foo></my-foo>`  <---- my-foo element matched the directive
+
+It is not expected that this will be a problem in practice because of widespread use of prefixes that make `<my-foo>` like
+elements unlikely.
+
+Closes #8321
+
+
+<a name="1.2.21"></a>
+# 1.2.21 wizard-props (2014-07-25)
+
+
+## Bug Fixes
+
+- **$http:** fix double-quoted date issue when encoding params
+  ([2f960f15](https://github.com/angular/angular.js/commit/2f960f1530ed936c57df612a352a0d996368f6a1),
+   [#8150](https://github.com/angular/angular.js/issues/8150), [#6128](https://github.com/angular/angular.js/issues/6128), [#8154](https://github.com/angular/angular.js/issues/8154))
+- **$location:** handle plus character in query strings
+  ([60af504c](https://github.com/angular/angular.js/commit/60af504c18dbdde9dfe90e9a2badef6d9e798512),
+   [#3042](https://github.com/angular/angular.js/issues/3042))
+- **$rootScope:** $watchCollection should handle NaN in objects
+  ([bf13d268](https://github.com/angular/angular.js/commit/bf13d2683d5880b18db00087e80ee0fd5e1f429a),
+   [#7930](https://github.com/angular/angular.js/issues/7930))
+- **angular.copy:** clone regexp flags correctly
+  ([e25ed0d4](https://github.com/angular/angular.js/commit/e25ed0d48d9a1c577e78b1c96098841572c764ea),
+   [#5781](https://github.com/angular/angular.js/issues/5781), [#8337](https://github.com/angular/angular.js/issues/8337))
+- **csp:** fix autodetection of CSP + better docs
+  ([0e5d3190](https://github.com/angular/angular.js/commit/0e5d31908e122f013427164f7bbeea914a9a5961),
+   [#8162](https://github.com/angular/angular.js/issues/8162), [#8191](https://github.com/angular/angular.js/issues/8191))
+- **docs:** change plnkr form to open in same window
+  ([5d11e020](https://github.com/angular/angular.js/commit/5d11e02008731a78f302841863a83fe7ed3c37b9))
+- **jqLite:** triggerHandler support unbind self
+  ([209e6000](https://github.com/angular/angular.js/commit/209e60007042f7e8b34c54ec6bf7d6f703c0ba2a),
+   [#5984](https://github.com/angular/angular.js/issues/5984))
+- **ngHref:** remove attribute when empty value instead of ignoring
+  ([948c86c6](https://github.com/angular/angular.js/commit/948c86c6025fca8e07921869d21cfac1c6333b05),
+   [#2755](https://github.com/angular/angular.js/issues/2755))
+- **ngRoute:** remove unnecessary call to decodeURIComponent
+  ([1b779028](https://github.com/angular/angular.js/commit/1b779028fdd339febaa1fff5f3bd4cfcda46cc09),
+   [#6326](https://github.com/angular/angular.js/issues/6326), [#6327](https://github.com/angular/angular.js/issues/6327))
+- **ngSanitize:**
+  - follow HTML parser rules for start tags / allow < in text content
+  ([d175bb01](https://github.com/angular/angular.js/commit/d175bb01314efdcbad5c3cb31b02e298e26c6e19),
+   [#8212](https://github.com/angular/angular.js/issues/8212), [#8193](https://github.com/angular/angular.js/issues/8193))
+- **orderBy:** correctly order by date values
+  ([f1b28847](https://github.com/angular/angular.js/commit/f1b28847c8123483e03ac2410de86fd33a80b5f4),
+   [#6675](https://github.com/angular/angular.js/issues/6675), [#6746](https://github.com/angular/angular.js/issues/6746))
+- **select:** force visual update in IE
+  ([c0afbfac](https://github.com/angular/angular.js/commit/c0afbfaca57893403d8d4b0990879ad5b9ffc3e5),
+   [#7692](https://github.com/angular/angular.js/issues/7692), [#8158](https://github.com/angular/angular.js/issues/8158))
+
+
+## Performance Improvements
+
+- **$compile:** only create jqLite object when necessary
+  ([71eb1901](https://github.com/angular/angular.js/commit/71eb1901f6b9a3a6d4b772aa95ce0dc78ff847bc))
+- **$parse:** don't use reflective calls in generated functions
+  ([cbdf0c2a](https://github.com/angular/angular.js/commit/cbdf0c2afb9836ae4cca6d70cf555ff28f55a1d1))
+- **forEach:** use native for loop instead of forEach for Arrays
+  ([492b0cdf](https://github.com/angular/angular.js/commit/492b0cdf28d02f1d508455245b7d8e1d641d9f40))
+- **jqLite:** expose the low-level jqLite.data/removeData calls
+  ([3c46c943](https://github.com/angular/angular.js/commit/3c46c94342aa35131f3ba0f8f4a6b39338b87d56))
+- **ngBindHtml:** move addClass to the compile phase
+  ([8eede099](https://github.com/angular/angular.js/commit/8eede099cd8aa6d524d1de385d08432072fd294e),
+   [#8261](https://github.com/angular/angular.js/issues/8261))
+
+
+<a name="1.3.0-beta.16"></a>
+# 1.3.0-beta.16 pizza-transubstantiation (2014-07-18)
+
+## Bug Fixes
+
+- **$cookie:** use `decodeURIComponent` instead of unescape for cookie reading
+  ([1c9ab40d](https://github.com/angular/angular.js/commit/1c9ab40d286ffdb1b41d30ca8d861b53175bfc24),
+   [#8125](https://github.com/angular/angular.js/issues/8125))
+- **$http:** fix double-quoted date issue when encoding params
+  ([9dce42b3](https://github.com/angular/angular.js/commit/9dce42b3c26eb02621723172a68725980369b849),
+   [#8150](https://github.com/angular/angular.js/issues/8150), [#6128](https://github.com/angular/angular.js/issues/6128), [#8154](https://github.com/angular/angular.js/issues/8154))
+- **$location:** handle plus character in query strings
+  ([3f4ee151](https://github.com/angular/angular.js/commit/3f4ee1513901f55d6007e3fc3948458adf4ac656),
+   [#3042](https://github.com/angular/angular.js/issues/3042))
+- **$rootScope:**
+  - `$watchCollection` should handle `NaN` in objects
+  ([db9f2570](https://github.com/angular/angular.js/commit/db9f2570c18d77d0e51d5a7afa139d25d0bdc470),
+   [#7930](https://github.com/angular/angular.js/issues/7930))
+  - remove support for a watch action to be a string
+  ([02c0ed27](https://github.com/angular/angular.js/commit/02c0ed27bc375d5352fefdd7e34aad9758621283),
+   [#8190](https://github.com/angular/angular.js/issues/8190))
+- **csp:** fix autodetection of CSP + better docs
+  ([0113f225](https://github.com/angular/angular.js/commit/0113f2257415422729d5c2a9bdba76c1d0a17a13),
+   [#8162](https://github.com/angular/angular.js/issues/8162), [#8191](https://github.com/angular/angular.js/issues/8191))
+- **ngList:** use custom separators for re-joining list items
+  ([c6c9d26e](https://github.com/angular/angular.js/commit/c6c9d26e3487ce24ece390c26994123964f805b0),
+   [#4008](https://github.com/angular/angular.js/issues/4008), [#2561](https://github.com/angular/angular.js/issues/2561), [#4344](https://github.com/angular/angular.js/issues/4344))
+- **ngRoute:** remove unnecessary call to `decodeURIComponent`
+  ([528f56a6](https://github.com/angular/angular.js/commit/528f56a690295650f54eeb2238609446635c5db0),
+   [#6326](https://github.com/angular/angular.js/issues/6326), [#6327](https://github.com/angular/angular.js/issues/6327))
+- **ngSanitize:** follow HTML parser rules for start tags / allow < in text content
+  ([f6681d41](https://github.com/angular/angular.js/commit/f6681d41a493efa6566f8a8a0b6ec39547e572ef),
+   [#8212](https://github.com/angular/angular.js/issues/8212), [#8193](https://github.com/angular/angular.js/issues/8193))
+- **ngSwitch:**
+  - interoperate with multi-element transclude directives
+  ([c20d438a](https://github.com/angular/angular.js/commit/c20d438ac9b9757331d096969a73c782c38e098a),
+   [#8235](https://github.com/angular/angular.js/issues/8235), [#8244](https://github.com/angular/angular.js/issues/8244))
+  - use the correct transclusion scope
+  ([4f32e3ee](https://github.com/angular/angular.js/commit/4f32e3eef152bcaab7f7ab151fc824e71a591473),
+   [#8235](https://github.com/angular/angular.js/issues/8235))
+- **orderBy:** correctly order by date values
+  ([92bceb5c](https://github.com/angular/angular.js/commit/92bceb5c5b6e4a5a8fee01e1e0dfcf4674858cf2),
+   [#6675](https://github.com/angular/angular.js/issues/6675), [#6746](https://github.com/angular/angular.js/issues/6746))
+- **select:** force visual update in IE
+  ([d7f73022](https://github.com/angular/angular.js/commit/d7f730228d58d3a409846e64ba5d0120356691cc),
+   [#7692](https://github.com/angular/angular.js/issues/7692), [#8158](https://github.com/angular/angular.js/issues/8158))
+
+
+## Features
+
+- **$compile:** explicitly request multi-element directive behaviour
+  ([e8066c4b](https://github.com/angular/angular.js/commit/e8066c4b4ce11496b0d8f39e41b4d753048bca2d),
+   [#5372](https://github.com/angular/angular.js/issues/5372), [#6574](https://github.com/angular/angular.js/issues/6574), [#5370](https://github.com/angular/angular.js/issues/5370), [#8044](https://github.com/angular/angular.js/issues/8044), [#7336](https://github.com/angular/angular.js/issues/7336))
+- **ngList:** use ngTrim to manage whitespace handling when splitting
+  ([8d18d20e](https://github.com/angular/angular.js/commit/8d18d20e316ed9d420f09f46f90027aef2940930))
+- **ngTransclude:** allow ngTransclude to be used as an element
+  ([3dafcba9](https://github.com/angular/angular.js/commit/3dafcba9c1738b85f3adceaac90b747a1b595ea8),
+   [#8141](https://github.com/angular/angular.js/issues/8141))
+
+
+## Performance Improvements
+
+- **$compile:** only create jqLite object when necessary
+  ([a160f76f](https://github.com/angular/angular.js/commit/a160f76ffa9544cd2ed99f24ba65b5994108f9f5))
+- **bindOnce** more performant interpolation and lazy one-time binding
+  ([86d55c1d](https://github.com/angular/angular.js/commit/86d55c1ded21a5be6091344493d70c6dc4194e43))
+- **jqLite:** expose the low-level jqLite.data/removeData calls
+  ([e4ba8943](https://github.com/angular/angular.js/commit/e4ba89436aa0b96f126ce2c23d0c7f7c785573fe))
+- **ngBindHtml:** move addClass to the compile phase
+  ([903e7352](https://github.com/angular/angular.js/commit/903e7352c9943e4d3757dd1cff58178d4c5375d6),
+   [#8261](https://github.com/angular/angular.js/issues/8261))
+
+
+## Breaking Changes
+
+- **$compile:** due to [e8066c4b](https://github.com/angular/angular.js/commit/e8066c4b4ce11496b0d8f39e41b4d753048bca2d),
+  Directives which previously depended on the implicit grouping between
+directive-start and directive-end attributes must be refactored in order to see this same behaviour.
+
+Before:
+
+```html
+<div data-fancy-directive-start>{{start}}</div>
+  <p>Grouped content</p>
+<div data-fancy-directive-end>{{end}}</div>
+```
+```javascript
+.directive('fancyDirective', function() {
+  return {
+    link: angular.noop
+  };
+})
+```
+
+After:
+
+```html
+<div data-fancy-directive-start>{{start}}</div>
+  <p>Grouped content</p>
+<div data-fancy-directive-end>{{end}}</div>
+```
+```javascript
+.directive('fancyDirective', function() {
+  return {
+    multiElement: true, // Explicitly mark as a multi-element directive.
+    link: angular.noop
+  };
+})
+```
+
+Closes #5372
+Closes #6574
+Closes #5370
+Closes #8044
+Closes #7336
+
+- **$rootScope:** due to [02c0ed27](https://github.com/angular/angular.js/commit/02c0ed27bc375d5352fefdd7e34aad9758621283),
+
+
+Previously, it was possible for an action passed to $watch
+to be a string, interpreted as an angular expresison. This is no longer supported.
+The action now has to be a function.
+Passing an action to $watch is still optional.
+
+Before:
+
+```javascript
+$scope.$watch('state', ' name="" ');
+```
+
+After:
+
+```javascript
+$scope.$watch('state', function () {
+  $scope.name = "";
+});
+```
+
+Closes #8190
+
+- **bootstrap:** due to [666a3835](https://github.com/angular/angular.js/commit/666a3835d231b3f77f907276be18b3c0086e5d12),
+
+
+If using any of the mechanisms specified above, then migrate by
+specifying the attribute `ng-app` to the root element. E.g.
+
+```html
+<div ng-app="module">...</div>
+```
+
+Closes #8147
+
+- **ngList:** due to [c6c9d26e](https://github.com/angular/angular.js/commit/c6c9d26e3487ce24ece390c26994123964f805b0),
+
+
+The `ngList` directive no longer supports splitting the view value
+via a regular expression. We need to be able to re-join list items back
+together and doing this when you can split with regular expressions can
+lead to inconsistent behaviour and would be much more complex to support.
+
+If your application relies upon ngList splitting with a regular expression
+then you should either try to convert the separator to a simple string or
+you can implement your own version of this directive for you application.
+
+Closes #4008
+Closes #2561
+Closes #4344
+
+- **ngSwitch:** due to [4f32e3ee](https://github.com/angular/angular.js/commit/4f32e3eef152bcaab7f7ab151fc824e71a591473),
+
+** Directive Priority Changed ** - this commit changes the priority
+of `ngSwitchWhen` and `ngSwitchDefault` from `800` to `1200`. This makes their
+priority higher than `ngRepeat`, which allows items to be repeated on
+the switch case element reliably.
+
+In general your directives should have a lower priority than these directives
+if you want them to exist inside the case elements. If you relied on the
+priority of these directives then you should check that your code still
+operates correctly.
+
+Closes #8235
 
 <a name="1.3.0-beta.15"></a>
 # 1.3.0-beta.15 unbelievable-advancement (2014-07-11)
@@ -318,6 +622,36 @@ Closes #3969
 Closes #4277
 Closes #7960
 
+- **$timeout/$interval:**
+  - due to [19b6b343](https://github.com/angular/angular.js/commit/19b6b3433ae9f8523cbc72ae97dbcf0c06960148)
+
+
+Previously, even if invokeApply was set to false, a $rootScope digest would occur during promise
+resolution. This is no longer the case, as promises returned from $timeout and $interval will no
+longer trigger $evalAsync (which in turn causes a $digest) if `invokeApply` is false.
+
+Workarounds include manually triggering $scope.$apply(), or returning $q.defer().promise from a
+promise callback, and resolving or rejecting it when appropriate.
+
+    var interval = $interval(function() {
+      if (someRequirementFulfilled) {
+        $interval.cancel(interval);
+        $scope.$apply();
+      }
+    }, 100, 0, false);
+
+or:
+
+    var interval = $interval(function (idx) {
+      // make the magic happen
+    }, 1000, 10, false);
+    interval.then(function(idx) {
+      var deferred = $q.defer();
+      // do the asynchronous magic --- $evalAsync will cause a digest and cause
+      // bindings to update.
+      return deferred.promise;
+    });
+
 <a name="1.2.19"></a>
 # 1.2.19 precognitive-flashbacks (2014-06-30)
 

CONTRIBUTING.md

@@ -119,7 +119,7 @@ Before you submit your pull request consider the following guidelines:
     ```
 
 * In GitHub, send a pull request to `angular:master`.
-* If we suggest changes then 
+* If we suggest changes then
   * Make the required updates.
   * Re-run the Angular test suite to ensure tests are still passing.
   * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
@@ -237,7 +237,7 @@ reference GitHub issues that this commit **Closes**.
 
 A detailed explanation can be found in this [document][commit-message-format].
 
-## <a name="cla"></a> Signing the CLA 
+## <a name="cla"></a> Signing the CLA
 
 Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code
 changes to be accepted, the CLA must be signed. It's a quick process, we promise!

Gruntfile.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var files = require('./angularFiles').files;
 var util = require('./lib/grunt/utils.js');
 var versionInfo = require('./lib/versions/version-info');
@@ -107,6 +109,9 @@ module.exports = function(grunt) {
       options: {
         jshintrc: true,
       },
+      node: {
+        files: { src: ['*.js', 'lib/**/*.js'] },
+      },
       tests: {
         files: { src: 'test/**/*.js' },
       },
@@ -252,7 +257,11 @@ module.exports = function(grunt) {
     compress: {
       build: {
         options: {archive: 'build/' + dist +'.zip', mode: 'zip'},
-        src: ['**'], cwd: 'build', expand: true, dot: true, dest: dist + '/'
+        src: ['**'],
+        cwd: 'build',
+        expand: true,
+        dot: true,
+        dest: dist + '/'
       }
     },
 

TRIAGING.md

@@ -44,11 +44,11 @@ This process based on the idea of minimizing user pain
     * Label `needs: breaking change` - if needed
     * Label `needs: public api` - if the issue requires introduction of a new public API
 1. Label `browser: *` - if the issue **only** affects a certain browser
-1. Label `frequency: *` – How often does this issue come up? How many developers does this affect?
+1. Label `frequency: *` – How often does this issue come up? How many developers does this affect? Chose just one of the following:
     * low - obscure issue affecting a handful of developers
     * moderate - impacts a common usage pattern
     * high - impacts most or all Angular apps
-1. Label `severity: *` - How bad is the issue?
+1. Label `severity: *` - How bad is the issue? Chose just one of the following:
     * security issue
     * regression
     * memory leak
@@ -61,9 +61,9 @@ This process based on the idea of minimizing user pain
 1. Label `origin: google` for issues from Google
 
 1. Assign a milestone:
-   * Backlog - triaged fixes and features, should be the default choice 
+   * Backlog - triaged fixes and features, should be the default choice
    * Current 1.x.y milestone (e.g. 1.3.0-beta-2) - regressions and urgent bugs only
-    
+
 
 1. Unassign yourself from the issue
 

angularFiles.js

@@ -1,4 +1,6 @@
-angularFiles = {
+'use strict';
+
+var angularFiles = {
   'angularSrc': [
     'src/minErr.js',
     'src/Angular.js',

changelog.js

@@ -3,6 +3,8 @@
 // TODO(vojta): pre-commit hook for validating messages
 // TODO(vojta): report errors, currently Q silence everything which really sucks
 
+'use strict';
+
 var child = require('child_process');
 var fs = require('fs');
 var util = require('util');
@@ -164,7 +166,7 @@ var writeChangelog = function(stream, commits, version) {
         hash: commit.hash,
         closes: []
       });
-    };
+    }
   });
 
   stream.write(util.format(HEADER_TPL, version, version, currentDate()));
@@ -172,7 +174,7 @@ var writeChangelog = function(stream, commits, version) {
   printSection(stream, 'Features', sections.feat);
   printSection(stream, 'Performance Improvements', sections.perf);
   printSection(stream, 'Breaking Changes', sections.breaks, false);
-}
+};
 
 
 var getPreviousTag = function() {

changelog.spec.js

@@ -1,3 +1,7 @@
+/* global describe: false, it: false, expect: false */
+
+'use strict';
+
 describe('changelog.js', function() {
   var ch = require('./changelog');
 
@@ -13,7 +17,7 @@ describe('changelog.js', function() {
       expect(msg.hash).toBe('9b1aff905b638aa274a5fc8f88662df446d374bd');
       expect(msg.subject).toBe('broadcast $destroy event on scope destruction');
       expect(msg.body).toBe('perf testing shows that in chrome this change adds 5-15% overhead\n' +
-          'when destroying 10k nested scopes where each scope has a $destroy listener\n')
+          'when destroying 10k nested scopes where each scope has a $destroy listener\n');
       expect(msg.component).toBe('scope');
     });
 

compare-master-to-stable.js

@@ -1,5 +1,7 @@
 #!/usr/local/bin/node
 
+'use strict';
+
 var util = require('util');
 var cp = require('child_process');
 
@@ -143,7 +145,7 @@ then(allInSeries(function (branch) {
         return sha + (msg.toLowerCase().indexOf('fix') === -1 ? '   ' : ' * ') + msg;
       });
       branch.log = log.map(function (line) {
-        return line.substr(41)
+        return line.substr(41);
       });
       return branch;
     });

docs/app/assets/css/prettify.css

@@ -40,7 +40,7 @@ pre.prettyprint.linenums {
 }
 ol.linenums {
   margin: 0 0 0 33px; /* IE indents via margin-left */
-} 
+}
 ol.linenums li {
   padding-left: 12px;
   font-size:12px;

docs/app/assets/js/angular-bootstrap/bootstrap.js

@@ -11,7 +11,7 @@ directive.runnableExample = ['$templateCache', '$document', function($templateCa
          'ng-repeat="tab in tabs track by $index" ' +
          'href="" ' +
          'class="btn"' +
-         'ng-click="setTab($index)">' + 
+         'ng-click="setTab($index)">' +
     '    {{ tab }}' +
     '  </a>' +
     '</nav>';
@@ -103,7 +103,7 @@ directive.syntax = function() {
     restrict: 'A',
     link: function(scope, element, attrs) {
       function makeLink(type, text, link, icon) {
-        return '<a href="' + link + '" class="btn syntax-' + type + '" target="_blank" rel="nofollow">' + 
+        return '<a href="' + link + '" class="btn syntax-' + type + '" target="_blank" rel="nofollow">' +
                 '<span class="' + icon + '"></span> ' + text +
                '</a>';
       };
@@ -307,7 +307,7 @@ var popoverElement = function() {
       return this.titleElement.html(value);
     },
 
-    content : function(value) { 
+    content : function(value) {
       if(value && value.length > 0) {
         value = marked(value);
       }

docs/app/src/app.js

@@ -20,4 +20,4 @@ angular.module('docsApp', [
 
 .config(function($locationProvider) {
   $locationProvider.html5Mode(true).hashPrefix('!');
-});
+});

docs/app/src/errors.js

@@ -59,4 +59,4 @@ angular.module('errors', ['ngSanitize'])
       element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank'));
     }
   };
-}]);
+}]);

docs/app/src/examples.js

@@ -2,7 +2,12 @@ angular.module('examples', [])
 
 .factory('formPostData', ['$document', function($document) {
   return function(url, fields) {
-    var form = angular.element('<form style="display: none;" method="post" action="' + url + '" target="_blank"></form>');
+    /**
+     * Form previously posted to target="_blank", but pop-up blockers were causing this to not work.
+     * If a user chose to bypass pop-up blocker one time and click the link, they would arrive at
+     * a new default plnkr, not a plnkr with the desired template.
+     */
+    var form = angular.element('<form style="display: none;" method="post" action="' + url + '"></form>');
     angular.forEach(fields, function(value, name) {
       var input = angular.element('<input type="hidden" name="' +  name + '">');
       input.attr('value', value);
@@ -69,4 +74,4 @@ angular.module('examples', [])
         formPostData('http://plnkr.co/edit/?p=preview', postData);
       });
   };
-}]);
+}]);

docs/app/src/navigationService.js

@@ -21,4 +21,4 @@ angular.module('docsApp.navigationService', [])
 
     }
   };
-});
+});

docs/app/src/versions.js

@@ -1,15 +1,31 @@
+"use strict";
+
 angular.module('versions', [])
 
 .controller('DocsVersionsCtrl', ['$scope', '$location', '$window', 'NG_VERSIONS', function($scope, $location, $window, NG_VERSIONS) {
-  $scope.docs_versions = NG_VERSIONS;
   $scope.docs_version  = NG_VERSIONS[0];
 
+  for(var i=0, minor = NaN; i < NG_VERSIONS.length; i++) {
+    var version = NG_VERSIONS[i];
+    // NaN will give false here
+    if (minor <= version.minor) {
+      continue;
+    }
+    version.isLatest = true;
+    minor = version.minor;
+  }
+
+  $scope.docs_versions = NG_VERSIONS;
+  $scope.getGroupName = function(v) {
+    return v.isLatest ? 'Latest' : (v.isStable ? 'Stable' : 'Unstable');
+  };
+
   $scope.jumpToDocsVersion = function(version) {
     var currentPagePath = $location.path();
 
     // TODO: We need to do some munging of the path for different versions of the API...
-    
+
 
     $window.location = version.docsUrl + currentPagePath;
   };
-}]);
+}]);

docs/app/test/docsSpec.js

@@ -31,4 +31,4 @@ describe("DocsController", function() {
       expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']);
     }));
   });
-});
+});

docs/config/index.js

@@ -9,7 +9,7 @@ module.exports = function(config) {
 
   config = basePackage(config);
   config = examplesPackage(config);
-  
+
   config.append('processing.processors', [
     require('./processors/git-data'),
     require('./processors/error-docs'),

docs/config/processors/debug-dump.js

@@ -30,4 +30,4 @@ function writeFile(file, content) {
   return fs.makeTree(fs.directory(file)).then(function() {
     return fs.write(file, content, 'wb');
   });
-}
+}

docs/config/processors/error-docs.js

@@ -56,4 +56,4 @@ module.exports = {
 
     return docs.concat(_.values(errorNamespaces));
   }
-};
+};

docs/config/processors/git-data.js

@@ -17,4 +17,4 @@ module.exports = {
   process: function(extraData, gitData) {
     extraData.git = gitData;
   }
-};
+};

docs/config/processors/keywords.js

@@ -85,4 +85,4 @@ module.exports = {
     });
 
   }
-};
+};

docs/config/processors/versions-data.js

@@ -35,4 +35,4 @@ module.exports = {
 
     docs.push(versionDoc);
   }
-};
+};

docs/config/templates/error.template.html

@@ -14,4 +14,4 @@
   {$ doc.description | marked $}
 </div>
 
-{% endblock %}
+{% endblock %}

docs/config/templates/errorNamespace.template.html

@@ -25,4 +25,4 @@
   </div>
 </div>
 
-{% endblock %}
+{% endblock %}

docs/config/templates/indexPage.template.html

@@ -175,7 +175,7 @@
         <div class="container main-grid main-header-grid">
           <div class="grid-left">
             <div ng-controller="DocsVersionsCtrl" class="picker version-picker">
-              <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by (v.isStable?'Stable':'Unstable') for v in docs_versions"
+              <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by getGroupName(v) for v in docs_versions"
                       ng-model="docs_version"
                       ng-change="jumpToDocsVersion(docs_version)"
                       class="docs-version-jump">

docs/config/templates/protractorTests.template.js

@@ -4,4 +4,4 @@ describe("{$ doc.description $}", function() {
   });
 
 {$ doc.innerTest $}
-});
+});

docs/config/templates/runnableExample.template.html

@@ -24,4 +24,4 @@
 </div>
 
 {# Be aware that we need these extra new lines here or marked will not realise that the <div>
-   above is HTML and wrap each line in a <p> - thus breaking the HTML #}
+   above is HTML and wrap each line in a <p> - thus breaking the HTML #}

docs/config/templates/tutorial.template.html

@@ -1 +1 @@
-{% include 'overview.template.html' %}
+{% include 'overview.template.html' %}

docs/content/error/$injector/cdep.ngdoc

@@ -23,4 +23,4 @@ When an instance of `MyCtrl` is created, the service `myService` will be created
 by the `$injector`. `myService` depends on itself, which causes the `$injector`
 to detect a circular dependency and throw the error.
 
-For more information, see the {@link guide/di Dependency Injection Guide}.
+For more information, see the {@link guide/di Dependency Injection Guide}.

docs/content/error/$injector/itkn.ngdoc

@@ -23,4 +23,4 @@ To avoid the error, always use string literals for dependency injection annotati
 tokens.
 
 For an explanation of what injection annotations are and how to use them, refer
-to the {@link guide/di Dependency Injection Guide}.
+to the {@link guide/di Dependency Injection Guide}.

docs/content/error/$injector/pget.ngdoc

@@ -23,4 +23,4 @@ angular.module("myApp", [])
 ```
 
 For more information, refer to the {@link auto.$provide#provider
-$provide.provider} api doc.
+$provide.provider} api doc.

docs/content/error/$injector/unpr.ngdoc

@@ -14,7 +14,7 @@ angular.module('myApp', [])
   }]);
 ```
 
-The above code will fail with `$injector:unpr` if `myService` is not defined. 
+The above code will fail with `$injector:unpr` if `myService` is not defined.
 
 Making sure each dependency is defined will fix the problem, as noted below.
 
@@ -25,3 +25,33 @@ angular.module('myApp', [])
     // Do something with myService
   }]);
 ```
+
+An unknown provider error can also be caused by accidentally redefining a
+module using the `angular.module` API, as shown in the following example.
+
+```
+angular.module('myModule', [])
+  .service('myCoolService', function () { /* ... */ });
+
+angular.module('myModule', [])
+  // myModule has already been created! This is not what you want!
+  .directive('myDirective', ['myCoolService', function (myCoolService) {
+    // This directive definition throws unknown provider, because myCoolService
+    // has been destroyed.
+  }]);
+```
+
+To fix this problem, make sure you only define each module with the
+`angular.module(name, [requires])` syntax once across your entire project.
+Retrieve it for subsequent use with `angular.module(name)`. The fixed example
+is shown below.
+
+```
+angular.module('myModule', [])
+  .service('myCoolService', function () { /* ... */ });
+
+angular.module('myModule')
+  .directive('myDirective', ['myCoolService', function (myCoolService) {
+    // This directive definition does not throw unknown provider.
+  }]);
+```

docs/content/error/$interpolate/noconcat.ngdoc

@@ -9,4 +9,4 @@ it hard to reason about whether some combination of concatenated values are
 unsafe to use and could easily lead to XSS.
 
 For more information about how AngularJS helps keep your app secure, refer to
-the {@link ng.$sce $sce} API doc.
+the {@link ng.$sce $sce} API doc.

docs/content/error/$parse/isecdom.ngdoc

@@ -14,3 +14,34 @@ perform this check - it's up to the developer to not expose such sensitive and p
 directly on the scope chain.
 
 To resolve this error, avoid access to DOM nodes.
+
+
+# Event Handlers and Return Values
+
+The `$parse:isecdom` error also occurs when an event handler invokes a function that returns a DOM
+node.
+
+```html
+  <button ng-click="iWillReturnDOM()">click me</button>
+```
+
+```js
+  $scope.iWillReturnDOM = function() {
+    return someDomNode;
+  }
+```
+
+To fix this issue, avoid returning DOM nodes from event handlers.
+
+*Note: This error often means that you are accessing DOM from your controllers, which is usually
+a sign of poor coding style that violates separation of concerns.*
+
+
+# Implicit Returns in CoffeeScript
+
+This error can occur more frequently when using CoffeeScript, which has a feature called implicit
+returns. This language feature returns the last dereferenced object in the function when the
+function has no explicit return statement.
+
+The solution in this scenario is to add an explicit return statement. For example `return false` to
+the function.

docs/content/error/$parse/isecff.ngdoc

@@ -14,4 +14,4 @@ Example expression that would result in this error:
 
 ```
 <div>{{user.sendInfo.call({}, true)}}</div>
-```
+```

docs/content/error/$parse/isecfld.ngdoc

@@ -24,4 +24,4 @@ Example expressions that would result in this error:
 <div>{{user.__proto__.hasOwnProperty = $emit}}</div>
 
 <div>{{user.__defineGetter__('name', noop)}}</div>
-```
+```

docs/content/error/$resource/badname.ngdoc

@@ -5,4 +5,4 @@
 
 Occurs when you try to use the name `hasOwnProperty` as a name of a parameter.
 Generally, a name cannot be `hasOwnProperty` because it is used, internally, on a object
-and allowing such a name would break lookups on this object.
+and allowing such a name would break lookups on this object.

docs/content/error/ng/areq.ngdoc

@@ -5,4 +5,4 @@
 
 AngularJS often asserts that certain values will be present and truthy using a
 helper function. If the assertion fails, this error is thrown. To fix this problem,
-make sure that the value the assertion expects is defined and truthy.
+make sure that the value the assertion expects is defined and truthy.

docs/content/error/ng/badname.ngdoc

@@ -5,4 +5,4 @@
 
 Occurs when you try to use the name `hasOwnProperty` in a context where it is not allow.
 Generally, a name cannot be `hasOwnProperty` because it is used, internally, on a object
-and allowing such a name would break lookups on this object.
+and allowing such a name would break lookups on this object.

docs/content/error/ng/btstrpd.ngdoc

@@ -49,4 +49,4 @@ You can also get this error if you accidentally load AngularJS itself more than
     <script src="angular.js"></script>
   </body>
 </html>
-```
+```

docs/content/error/ng/cpi.ngdoc

@@ -7,4 +7,4 @@ This error occurs when attempting to copy an object to itself. Calling {@link
 api/angular.copy angular.copy} with a `destination` object deletes
 all of the elements or properties on `destination` before copying to it. Copying
 an object to itself is not supported. Make sure to check your calls to
-`angular.copy` and avoid copying objects or arrays to themselves.
+`angular.copy` and avoid copying objects or arrays to themselves.

docs/content/error/ng/cpws.ngdoc

@@ -7,4 +7,4 @@ Copying Window or Scope instances is not supported because of cyclical and self
 references. Avoid copying windows and scopes, as well as any other cyclical or
 self-referential structures. Note that trying to deep copy an object containing
 cyclical references that is neither a window nor a scope will cause infinite
-recursion and a stack overflow.
+recursion and a stack overflow.

docs/content/guide/$location.ngdoc

@@ -358,118 +358,308 @@ Note that when you type hashbang url into first browser (or vice versa) it doesn
 redirect to regular / hashbang url, as this conversion happens only during parsing the initial URL
 = on page reload.
 
-In this examples we use `<base href="/base/index.html" />`
-<example>
+In these examples we use `<base href="/base/index.html" />`
+
+#### Browser in HTML5 mode
+<example module="html5-mode" name="location-html5-mode">
   <file name="index.html">
-    <div id="html5-mode" ng-controller="Html5Cntl">
-      <h3>Browser with History API</h3>
-      <div ng-address-bar browser="html5"></div><br><br>
-      $location.protocol() = {{$location.protocol()}}<br>
-      $location.host() = {{$location.host()}}<br>
-      $location.port() = {{$location.port()}}<br>
-      $location.path() = {{$location.path()}}<br>
-      $location.search() = {{$location.search()}}<br>
-      $location.hash() = {{$location.hash()}}<br>
-      <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
-      <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
-      <a href="/other-base/another?search">external</a>
-    </div>
-
-    <div id="hashbang-mode" ng-controller="HashbangCntl">
-      <h3>Browser without History API</h3>
-      <div ng-address-bar browser="hashbang"></div><br><br>
-      $location.protocol() = {{$location.protocol()}}<br>
-      $location.host() = {{$location.host()}}<br>
-      $location.port() = {{$location.port()}}<br>
-      $location.path() = {{$location.path()}}<br>
-      $location.search() = {{$location.search()}}<br>
-      $location.hash() = {{$location.hash()}}<br>
-      <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
-      <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
-      <a href="/other-base/another?search">external</a>
+    <div ng-controller="LocationController">
+      <div ng-address-bar></div><br><br>
+      <div>
+        $location.protocol() = <span ng-bind="$location.protocol()"></span> <br>
+        $location.host() = <span ng-bind="$location.host()"></span> <br>
+        $location.port() = <span ng-bind="$location.port()"></span> <br>
+        $location.path() = <span ng-bind="$location.path()"></span> <br>
+        $location.search() = <span ng-bind="$location.search()"></span> <br>
+        $location.hash() = <span ng-bind="$location.hash()"></span> <br>
+      </div>
+      <div id="navigation">
+        <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
+        <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
+        <a href="/other-base/another?search">external</a>
+      </div>
     </div>
   </file>
+  <file name="app.js">
+   angular.module('html5-mode', ['fake-browser', 'address-bar'])
 
-  <file name="script.js">
-    function FakeBrowser(initUrl, baseHref) {
-      this.onUrlChange = function(fn) {
-        this.urlChange = fn;
+   .constant('initUrl', 'http://www.example.com/base/path?a=b#h')
+   .constant('baseHref', '/base/index.html')
+   .value('$sniffer', { history: true })
+
+   .controller("LocationController", function($scope, $location) {
+     $scope.$location = {};
+     angular.forEach("protocol host port path search hash".split(" "), function(method){
+      $scope.$location[method] = function(){
+        var result = $location[method].call($location);
+        return angular.isObject(result) ? angular.toJson(result) : result;
+      };
+     });
+   })
+
+   .config(function($locationProvider) {
+     $locationProvider.html5Mode(true).hashPrefix('!');
+   })
+
+   .run(function($rootElement) {
+     $rootElement.on('click', function(e) { e.stopPropagation(); });
+   });
+  </file>
+
+  <file name="fakeBrowser.js">
+    angular.module('fake-browser', [])
+
+    .config(function($provide) {
+     $provide.decorator('$browser', function($delegate, baseHref, initUrl) {
+
+      $delegate.onUrlChange = function(fn) {
+         this.urlChange = fn;
+       };
+
+      $delegate.url = function() {
+         return initUrl;
       };
 
-      this.url = function() {
-        return initUrl;
-      };
+      $delegate.defer = function(fn, delay) {
+         setTimeout(function() { fn(); }, delay || 0);
+       };
 
-      this.defer = function(fn, delay) {
-        setTimeout(function() { fn(); }, delay || 0);
-      };
+      $delegate.baseHref = function() {
+         return baseHref;
+       };
 
-      this.baseHref = function() {
-        return baseHref;
-      };
+       return $delegate;
+     });
+    });
+    </file>
 
-      this.notifyWhenOutstandingRequests = angular.noop;
-    }
+  <file name="addressBar.js">
+   angular.module('address-bar', [])
+   .directive('ngAddressBar', function($browser, $timeout) {
+      return {
+        template: 'Address: <input id="addressBar" type="text" style="width: 400px" >',
+        link: function(scope, element, attrs){
+          var input = element.children("input"), delay;
 
-    var browsers = {
-      html5: new FakeBrowser('http://www.example.com/base/path?a=b#h', '/base/index.html'),
-      hashbang: new FakeBrowser('http://www.example.com/base/index.html#!/path?a=b#h', '/base/index.html')
-    };
+          input.on('keypress keyup keydown', function(event) {
+                  delay = (!delay ? $timeout(fireUrlChange, 250) : null);
+                  event.stopPropagation();
+                })
+               .val($browser.url());
 
-    function Html5Cntl($scope, $location) {
-      $scope.$location = $location;
-    }
-
-    function HashbangCntl($scope, $location) {
-      $scope.$location = $location;
-    }
-
-    function initEnv(name) {
-      var root = angular.element(document.getElementById(name + '-mode'));
-      // We must kill a link to the injector for this element otherwise angular will
-      // complain that it has been bootstrapped already.
-      root.data('$injector', null);
-      angular.bootstrap(root, [function($compileProvider, $locationProvider, $provide){
-        $locationProvider.html5Mode(true).hashPrefix('!');
-
-        $provide.value('$browser', browsers[name]);
-        $provide.value('$sniffer', {history: name == 'html5'});
-
-        $compileProvider.directive('ngAddressBar', function() {
-          return function(scope, elm, attrs) {
-            var browser = browsers[attrs.browser],
-                input = angular.element('<input type="text" style="width: 400px">').val(browser.url()),
-                delay;
-
-            input.on('keypress keyup keydown', function() {
-              if (!delay) {
-                delay = setTimeout(fireUrlChange, 250);
-              }
-            });
-
-            browser.url = function(url) {
-              return input.val(url);
-            };
-
-            elm.append('Address: ').append(input);
-
-            function fireUrlChange() {
-              delay = null;
-              browser.urlChange(input.val());
-            }
+          $browser.url = function(url) {
+            return url ? input.val(url) : input.val();
           };
-        });
-      }]);
-      root.on('click', function(e) {
-        e.stopPropagation();
-      });
-    }
 
-    initEnv('html5');
-    initEnv('hashbang');
+          function fireUrlChange() {
+            delay = null;
+            $browser.urlChange(input.val());
+          }
+        }
+      };
+    });
   </file>
+
+  <file name="protractor.js" type="protractor">
+
+    var addressBar = element(by.css("#addressBar")),
+        url = 'http://www.example.com/base/path?a=b#h';
+
+
+    it("should show fake browser info on load", function(){
+      expect(addressBar.getAttribute('value')).toBe(url);
+
+      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
+      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port')).getText()).toBe('80');
+      expect(element(by.binding('$location.path')).getText()).toBe('/path');
+      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash')).getText()).toBe('h');
+
+    });
+
+    it("should change $location accordingly", function(){
+      var navigation = element.all(by.css("#navigation a"));
+
+      navigation.get(0).click();
+
+      expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/first?a=b");
+
+      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
+      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port')).getText()).toBe('80');
+      expect(element(by.binding('$location.path')).getText()).toBe('/first');
+      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash')).getText()).toBe('');
+
+
+      navigation.get(1).click();
+
+      expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/sec/ond?flag#hash");
+
+      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
+      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port')).getText()).toBe('80');
+      expect(element(by.binding('$location.path')).getText()).toBe('/sec/ond');
+      expect(element(by.binding('$location.search')).getText()).toBe('{"flag":true}');
+      expect(element(by.binding('$location.hash')).getText()).toBe('hash');
+    });
+
+  </file>
+
 </example>
 
+####Browser in HTML5 Fallback mode (Hashbang mode)
+<example module="hashbang-mode" name="location-hashbang-mode">
+  <file name="index.html">
+    <div ng-controller="LocationController">
+      <div ng-address-bar></div><br><br>
+      <div>
+        $location.protocol() = <span ng-bind="$location.protocol()"></span> <br>
+        $location.host() = <span ng-bind="$location.host()"></span> <br>
+        $location.port() = <span ng-bind="$location.port()"></span> <br>
+        $location.path() = <span ng-bind="$location.path()"></span> <br>
+        $location.search() = <span ng-bind="$location.search()"></span> <br>
+        $location.hash() = <span ng-bind="$location.hash()"></span> <br>
+      </div>
+      <div id="navigation">
+        <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
+        <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
+        <a href="/other-base/another?search">external</a>
+      </div>
+    </div>
+  </file>
+  <file name="app.js">
+    angular.module('hashbang-mode', ['fake-browser', 'address-bar'])
+
+    .constant('initUrl', 'http://www.example.com/base/index.html#!/path?a=b#h')
+    .constant('baseHref', '/base/index.html')
+    .value('$sniffer', { history: false })
+
+    .config(function($locationProvider) {
+      $locationProvider.html5Mode(true).hashPrefix('!');
+    })
+
+    .controller("LocationController", function($scope, $location) {
+      $scope.$location = {};
+      angular.forEach("protocol host port path search hash".split(" "), function(method){
+        $scope.$location[method] = function(){
+          var result = $location[method].call($location);
+          return angular.isObject(result) ? angular.toJson(result) : result;
+        };
+      });
+    })
+
+    .run(function($rootElement) {
+      $rootElement.on('click', function(e) {
+        e.stopPropagation();
+      });
+    });
+
+  </file>
+
+  <file name="fakeBrowser.js">
+    angular.module('fake-browser', [])
+
+    .config(function($provide) {
+     $provide.decorator('$browser', function($delegate, baseHref, initUrl) {
+
+      $delegate.onUrlChange = function(fn) {
+         this.urlChange = fn;
+       };
+
+      $delegate.url = function() {
+         return initUrl;
+      };
+
+      $delegate.defer = function(fn, delay) {
+         setTimeout(function() { fn(); }, delay || 0);
+       };
+
+      $delegate.baseHref = function() {
+         return baseHref;
+       };
+
+       return $delegate;
+     });
+    });
+  </file>
+
+
+  <file name="addressBar.js">
+   angular.module('address-bar', [])
+   .directive('ngAddressBar', function($browser, $timeout) {
+      return {
+        template: 'Address: <input id="addressBar" type="text" style="width: 400px" >',
+        link: function(scope, element, attrs){
+          var input = element.children("input"), delay;
+
+          input.on('keypress keyup keydown', function(event) {
+                  delay = (!delay ? $timeout(fireUrlChange, 250) : null);
+                  event.stopPropagation();
+                })
+               .val($browser.url());
+
+          $browser.url = function(url) {
+            return url ? input.val(url) : input.val();
+          };
+
+          function fireUrlChange() {
+            delay = null;
+            $browser.urlChange(input.val());
+          }
+        }
+      };
+    });
+  </file>
+
+  <file name="protractor.js" type="protractor">
+
+    var addressBar = element(by.css("#addressBar")),
+         url = 'http://www.example.com/base/index.html#!/path?a=b#h';
+
+    it("should show fake browser info on load", function(){
+      expect(addressBar.getAttribute('value')).toBe(url);
+
+      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
+      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port')).getText()).toBe('80');
+      expect(element(by.binding('$location.path')).getText()).toBe('/path');
+      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash')).getText()).toBe('h');
+
+    });
+
+    it("should change $location accordingly", function(){
+      var navigation = element.all(by.css("#navigation a"));
+
+      navigation.get(0).click();
+
+      expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/index.html#!/first?a=b");
+
+      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
+      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port')).getText()).toBe('80');
+      expect(element(by.binding('$location.path')).getText()).toBe('/first');
+      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash')).getText()).toBe('');
+
+
+      navigation.get(1).click();
+
+      expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/index.html#!/sec/ond?flag#hash");
+
+      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
+      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port')).getText()).toBe('80');
+      expect(element(by.binding('$location.path')).getText()).toBe('/sec/ond');
+      expect(element(by.binding('$location.search')).getText()).toBe('{"flag":true}');
+      expect(element(by.binding('$location.hash')).getText()).toBe('hash');
+
+    });
+  </file>
+
+</example>
 
 # Caveats
 

docs/content/guide/bootstrap.ngdoc

@@ -90,7 +90,7 @@ Here is an example of manually initializing Angular:
 <!doctype html>
 <html>
 <body>
-  Hello {{'World'}}!
+  Hello {{greetMe}}!
   <script src="http://code.angularjs.org/snapshot/angular.js"></script>
 
   <script>

docs/content/guide/compiler.ngdoc

@@ -198,7 +198,7 @@ This should help give you an idea of what Angular does internally.
 
   // Step 3: link the compiled template with the scope.
   var element = linkFn(scope);
-  
+
   // Step 4: Append to DOM (optional)
   parent.appendChild(element);
 ```

docs/content/guide/concepts.ngdoc

@@ -37,10 +37,10 @@ Let's start with input fields for quantity and cost whose values are multiplied
       <div ng-app ng-init="qty=1;cost=2">
         <b>Invoice:</b>
         <div>
-          Quantity: <input type="number" ng-model="qty" required >
+          Quantity: <input type="number" ng-model="qty">
         </div>
         <div>
-          Costs: <input type="number" ng-model="cost" required >
+          Costs: <input type="number" ng-model="cost">
         </div>
         <div>
           <b>Total:</b> {{qty * cost | currency}}
@@ -62,11 +62,8 @@ The first kind of new markup are the so called <a name="directive">"{@link direc
 They apply special behavior to attributes or elements in the HTML. In the example above we use the
 {@link ng.directive:ngApp `ng-app`} attribute, which is linked to a directive that automatically
 initializes our application. Angular also defines a directive for the {@link ng.directive:input `input`}
-element that adds extra behavior to the element. E.g. it is able to automatically validate that the entered
-text is non empty by evaluating the `required` attribute.
-The {@link ng.directive:ngModel `ng-model`} directive stores/updates
-the value of the input field into/from a variable and shows the validation state of the input field by
-adding css classes. In the example we use these css classes to mark an empty input field with a red border.
+element that adds extra behavior to the element. The {@link ng.directive:ngModel `ng-model`} directive
+stores/updates the value of the input field into/from a variable.
 
 <div class="alert alert-info">
 **Custom directives to access the DOM**: In Angular, the only place where an application touches the DOM is
@@ -323,7 +320,7 @@ The following example shows how this is done with Angular:
     angular.module('finance3', [])
       .factory('currencyConverter', ['$http', function($http) {
         var YAHOO_FINANCE_URL_PATTERN =
-              'http://query.yahooapis.com/v1/public/yql?q=select * from '+
+              '//query.yahooapis.com/v1/public/yql?q=select * from '+
               'yahoo.finance.xchange where pair in ("PAIRS")&format=json&'+
               'env=store://datatables.org/alltableswithkeys&callback=JSON_CALLBACK';
         var currencies = ['USD', 'EUR', 'CNY'];

docs/content/guide/directive.ngdoc

@@ -352,7 +352,7 @@ element as a customer component.
 Our `myCustomer` directive above is great, but it has a fatal flaw. We can only use it once within a
 given scope.
 
-In its current implementation, we'd need to create a different controller each time In order to
+In its current implementation, we'd need to create a different controller each time in order to
 re-use such a directive:
 
 <example module="docsScopeProblemExample">
@@ -475,7 +475,6 @@ within our directive's template:
     angular.module('docsIsolationExample', [])
       .controller('Controller', ['$scope', function($scope) {
         $scope.naomi = { name: 'Naomi', address: '1600 Amphitheatre' };
-
         $scope.vojta = { name: 'Vojta', address: '3456 Somewhere Else' };
       }])
       .directive('myCustomer', function() {
@@ -537,7 +536,7 @@ where:
 In our `link` function, we want to update the displayed time once a second, or whenever a user
 changes the time formatting string that our directive binds to. We will use the `$interval` service
 to call a handler on a regular basis. This is easier than using `$timeout` but also works better with
-end-to-end testing, where we want to ensure that all $timeouts have completed before completing the test.
+end-to-end testing, where we want to ensure that all `$timeout`s have completed before completing the test.
 We also want to remove the `$interval` if the directive is deleted so we don't introduce a memory leak.
 
 <example module="docsTimeDirective">
@@ -910,6 +909,30 @@ Looking back at `myPane`'s definition, notice the last argument in its `link` fu
 When a directive requires a controller, it receives that controller as the fourth argument of its
 `link` function. Taking advantage of this, `myPane` can call the `addPane` function of `myTabs`.
 
+If multiple controllers are required, the `require` option of the directive can take an array argument.
+The corresponding parameter being sent to the `link` function will also be an array.
+
+```js
+angular.module('docsTabsExample', [])
+  .directive('myPane', function() {
+    return {
+      require: ['^myTabs', '^ngModel'],
+      restrict: 'E',
+      transclude: true,
+      scope: {
+        title: '@'
+      },
+      link: function(scope, element, attrs, controllers) {
+        var tabsCtrl = controllers[0],
+            modelCtrl = controllers[1];
+
+        tabsCtrl.addPane(scope);
+      },
+      templateUrl: 'my-pane.html'
+    };
+  });
+```
+
 Savvy readers may be wondering what the difference is between `link` and `controller`.
 The basic difference is that `controller` can expose an API, and `link` functions can interact with
 controllers using `require`.

docs/content/guide/forms.ngdoc

@@ -134,7 +134,7 @@ This allows us to extend the above example with these features:
 
 <example module="formExample">
   <file name="index.html">
-    <div ng-controller="Controller">
+    <div ng-controller="ExampleController">
       <form name="form" class="css-form" novalidate>
         Name:
           <input type="text" ng-model="user.name" name="uName" required /><br />

docs/content/guide/index.ngdoc

@@ -47,7 +47,7 @@ In Angular applications, you move the job of filling page templates with data fr
 
 ### Testing
 
-* **Unit testing:** [Using Karma (video)](http://www.youtube.com/watch?v=YG5DEzaQBIc), {@link guide/dev_guide.unit-testing Unit testing}, {@link guide/dev_guide.services.testing_services Testing services}, [Karma in Webstorm](http://blog.jetbrains.com/webstorm/2013/10/running-javascript-tests-with-karma-in-webstorm-7/)
+* **Unit testing:** [Using Karma (video)](http://www.youtube.com/watch?v=YG5DEzaQBIc), {@link guide/unit-testing Unit testing}, {@link guide/services#unit-testing Testing services}, [Karma in Webstorm](http://blog.jetbrains.com/webstorm/2013/10/running-javascript-tests-with-karma-in-webstorm-7/)
 * **Scenario testing:** [Protractor](https://github.com/angular/protractor)
 
 ## Specific Topics

docs/content/guide/migration.ngdoc

@@ -382,8 +382,6 @@ See [80739409](https://github.com/angular/angular.js/commit/807394095b991357225a
 
 ## ngBindHtmlUnsafe has been removed and replaced by ngBindHtml
 
-`ngBindHtml` which has been moved from `ngSanitize` module to the core `ng` module.
-
 `ngBindHtml` provides `ngBindHtmlUnsafe` like
 behavior (evaluate an expression and innerHTML the result into the DOM) when bound to the result
 of `$sce.trustAsHtml(string)`. When bound to a plain string, the string is sanitized via
@@ -391,6 +389,10 @@ of `$sce.trustAsHtml(string)`. When bound to a plain string, the string is sanit
 module is not loaded) and the bound expression evaluates to a value that is not trusted an
 exception is thrown.
 
+When using this directive you can either include `ngSanitize` in your module's dependencis (See the
+example at the {@link ngBindHtml} reference) or use the {@link $sce} service to set the value as
+trusted.
+
 See [dae69473](https://github.com/angular/angular.js/commit/dae694739b9581bea5dbc53522ec00d87b26ae55).
 
 

docs/content/guide/module.ngdoc

@@ -45,6 +45,12 @@ I'm in a hurry. How do I get a Hello World module working?
       };
     });
   </file>
+
+  <file name="protractor.js" type="protractor">
+    it('should add Hello to the name', function() {
+      expect(element(by.binding("{{ 'World' | greet }}")).getText()).toEqual('Hello, World!');
+    });
+  </file>
 </example>
 
 Important things to notice:
@@ -75,13 +81,14 @@ The above is a suggestion. Tailor it to your needs.
 <example module='xmpl'>
   <file name="index.html">
     <div ng-controller="XmplController">
-      {{ greeting }}!
+      {{ greeting }}
     </div>
   </file>
 
   <file name="script.js">
-    angular.module('xmpl.service', []).
-      value('greeter', {
+    angular.module('xmpl.service', [])
+
+      .value('greeter', {
         salutation: 'Hello',
         localize: function(localization) {
           this.salutation = localization.salutation;
@@ -89,8 +96,9 @@ The above is a suggestion. Tailor it to your needs.
         greet: function(name) {
           return this.salutation + ' ' + name + '!';
         }
-      }).
-      value('user', {
+      })
+
+      .value('user', {
         load: function(name) {
           this.name = name;
         }
@@ -100,21 +108,28 @@ The above is a suggestion. Tailor it to your needs.
 
     angular.module('xmpl.filter', []);
 
-    angular.module('xmpl', ['xmpl.service', 'xmpl.directive', 'xmpl.filter']).
-      run(function(greeter, user) {
+    angular.module('xmpl', ['xmpl.service', 'xmpl.directive', 'xmpl.filter'])
+
+      .run(function(greeter, user) {
         // This is effectively part of the main method initialization code
         greeter.localize({
           salutation: 'Bonjour'
         });
         user.load('World');
+      })
+
+      .controller('XmplController', function($scope, greeter, user){
+        $scope.greeting = greeter.greet(user.name);
       });
 
-
-    // A Controller for your app
-    var XmplController = function($scope, greeter, user) {
-      $scope.greeting = greeter.greet(user.name);
-    };
   </file>
+
+  <file name="protractor.js" type="protractor">
+    it('should add Hello to the name', function() {
+      expect(element(by.binding("{{ greeting }}")).getText()).toEqual('Bonjour World!');
+    });
+  </file>
+
 </example>
 
 

docs/content/guide/providers.ngdoc

@@ -132,9 +132,11 @@ In the code above, we see how the `apiToken` service is defined via the Factory
 on the `clientId` service. The factory service then uses NSA-proof encryption to produce an authentication
 token.
 
-Note: It is best practice to name the factory functions as `<serviceId>Factory`
+<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
 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
 primitive, object literal, function, or even an instance of a custom type.
@@ -193,8 +195,7 @@ that would mess with the teachers.
 
 ## Provider Recipe
 
-There are two more recipe types left to cover. They are both fairly specialized and are used
-infrequently. As already mentioned in the intro, the Provider recipe is the core recipe type and
+As already mentioned in the intro, the Provider recipe is the core recipe type and
 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.
 

docs/content/guide/scope.ngdoc

@@ -113,7 +113,7 @@ may have several child scopes.
 The application can have multiple scopes, because some {@link guide/directive directives} create
 new child scopes (refer to directive documentation to see which directives create new scopes).
 When new scopes are created, they are added as children of their parent scope. This creates a tree
-structure which parallels the DOM where they're attached
+structure which parallels the DOM where they're attached.
 
 When Angular evaluates `{{name}}`, it first looks at the scope associated with the given
 element for the `name` property. If no such property is found, it searches the parent scope

docs/content/guide/unit-testing.ngdoc

@@ -337,6 +337,80 @@ We inject the $compile service and $rootScope before each jasmine test. The $com
 to render the aGreatEye directive. After rendering the directive we ensure that the directive has
 replaced the content and "lidless, wreathed in flame, 2 times" is present.
 
+### Testing Transclusion Directives
+
+Directives that use transclusion are treated specially by the compiler.  Before their compile
+function is called, the contents of the directive's element are removed from the element and
+provided via a transclusion function.  The directive's template is then appended to the directive's
+element, to which it can then insert the transcluded content into its template.
+
+
+Before compilation:
+```html
+<div translude-directive>
+  Some transcluded content
+</div>
+```
+
+After transclusion extraction:
+```html
+<div transclude-directive></div>
+```
+
+After compilation:
+```html
+<div transclude-directive>
+  Some Template
+  <span ng-transclude>Some transcluded content</span>
+</div>
+```
+
+If the directive is using 'element' transclusion, the compiler will actually remove the
+directive's entire element from the DOM and replace it with a comment node. The compiler then
+inserts the directive's template "after" this comment node, as a sibling.
+
+Before compilation
+```html
+<div element-transclude>
+  Some Content
+</div>
+```
+
+After transclusion extraction
+```html
+<!-- elementTransclude -->
+```
+
+After compilation:
+```html
+<!-- elementTransclude -->
+<div element-transclude>
+  Some Template
+  <span ng-transclude>Some transcluded content</span>
+</div>
+```
+
+It is important to be aware of this when writing tests for directives that use 'element'
+transclusion.  If you place the directive on the root element of the DOM fragment that you
+pass to {@link $compile}, then the DOM node returned from the linking function will be the
+comment node and you will lose the ability to access the template and transcluded content.
+
+```javascript
+var node = $compile('<div element-transclude></div>')($rootScope);
+expect(node[0].nodeType).toEqual(node.COMMENT_NODE);
+expect(node[1]).toBeUndefined();
+```
+
+To cope with this you simply ensure that your 'element' transclude directive is wrapped in an
+element, such as a `<div>`.
+
+```javascript
+var node = $compile('<div><div element-transclude></div></div>')($rootScope);
+var contents = node.contents();
+expect(contents[0].nodeType).toEqual(node.COMMENT_NODE);
+expect(contents[1].nodeType).toEqual(node.ELEMENT_NODE);
+```
+
 ### Testing Directives With External Templates
 
 If your directive uses `templateUrl`, consider using

docs/content/misc/downloading.ngdoc

@@ -83,4 +83,4 @@ after the core `angular.js` file:
 our docs, or even more importantly, view the docs offline.
 
 * __`i18n`__ - this directory contains locale specific `ngLocale` angular modules to override the defaults
-defined in the `ng` module.
+defined in the `ng` module.

docs/content/misc/faq.ngdoc

@@ -16,7 +16,7 @@ Because HTML has Angular brackets and "ng" sounds like "Angular".
 AngularJS fits the definition of a framework the best, even though it's much more lightweight than
 a typical framework and that's why many confuse it with a library.
 
-AngularJS is 100% JavaScript, 100% client side and compatible with both desktop and mobile browsers.
+AngularJS is 100% JavaScript, 100% client-side and compatible with both desktop and mobile browsers.
 So it's definitely not a plugin or some other native browser extension.
 
 
@@ -114,7 +114,7 @@ make our schwag will be happy to do a custom run for you, based on our existing
 they'll waive the setup costs, and you can order any quantity you need.
 
 **Stickers**
-For orders of 250 stickers or more within Canada or the United States, contact Tom Witting (or anyone in sales) via email at tom@stickergiant.com, and tell him you want to order some AngularJS
+For orders of 250 stickers or more within Canada or the United States, contact Tom Witting (or anyone in sales) via email at <tom@stickergiant.com>, and tell him you want to order some AngularJS
 stickers just like the ones in job #42711. You'll have to give them your own info for billing and shipping.
 
 As long as the design stays exactly the same, [StickerGiant](http://www.stickergiant.com) will give you a reorder discount.

docs/content/tutorial/step_00.ngdoc

@@ -31,7 +31,7 @@ npm install
 
 To see the app running in a browser, open a *separate* terminal/command line tab or window, then
 run `npm start` to start the web server. Now, open a browser window for the app and navigate to
-<a href="http://localhost:8000/app/index.html" target="_blank">`http://localhost:8000/app/index.html`</a>
+<a href="http://localhost:8000/app/" target="_blank">`http://localhost:8000/app/`</a>
 
 You can now see the page in your browser. It's not very exciting, but that's OK.
 

docs/content/tutorial/step_02.ngdoc

@@ -59,12 +59,17 @@ tag as the template.
 by the value of the expressions.
 
 We have added a new directive, called `ng-controller`, which attaches a `PhoneListCtrl`
-__controller__ to the DOM at this point:
+__controller__ to the <body> tag.  At this point:
 
 * The expressions in curly braces (`{{phone.name}}` and `{{phone.snippet}}` denote
 bindings, which are referring to our application model, which is set up in our `PhoneListCtrl`
 controller.
 
+<div class="alert alert-info">
+Note: We have specified an {@link angular.Module Angular Module} to load using `ng-app="phonecatApp"`,
+where `phonecatApp` is the name of our module.  This module will contain the `PhoneListCtrl`.
+</div>
+
 <img class="diagram" src="img/tutorial/tutorial_02.png">
 
 ## Model and Controller
@@ -205,6 +210,11 @@ To run the tests, and then watch the files for changes: `npm test`.
 * To rerun the tests, just change any of the source or test .js files. Karma will notice the change
   and will rerun the tests for you. Now isn't that sweet?
 
+<div class="alert alert-info">
+Make sure you don't minimize the browser that Karma opened. On some OS, memory assigned to a minimized
+browser is limited, which results in your karma tests running extremely slow.
+</div>
+
 # Experiments
 
 * Add another binding to `index.html`. For example:
@@ -255,4 +265,4 @@ to the app.
 
 [jasmine]: http://jasmine.github.io/
 [jasmine-docs]: http://jasmine.github.io/1.3/introduction.html
-[karma]: http://karma-runner.github.io/
+[karma]: http://karma-runner.github.io/

docs/content/tutorial/step_03.ngdoc

@@ -128,7 +128,9 @@ will exit after the test run and will not automatically rerun the test suite on
 To rerun the test suite, execute `npm run protractor` again.
 
 <div class="alert alert-info">
-  Note: You must ensure you've installed the protractor and updated webdriver prior to running the
+  Note: You must ensure your application is being served via a web-server to test with protractor.
+  You can do this using `npm start`.
+  You also need to ensure you've installed the protractor and updated webdriver prior to running the
   `npm run protractor`. You can do this by issuing `npm install` and `npm run update-webdriver` into
   your terminal.
 </div>
@@ -143,16 +145,39 @@ Display the current value of the `query` model by adding a `{{query}}` binding i
 ### Display Query in Title
 Let's see how we can get the current value of the `query` model to appear in the HTML page title.
 
-* Add the following end-to-end test into the `describe` block within `test/e2e/scenarios.js`:
+* Add an end-to-end test into the `describe` block, `test/e2e/scenarios.js` should look like this:
 
   ```js
-    it('should display the current filter value in the title bar', function() {
+    describe('PhoneCat App', function() {
 
-      expect(browser.getTitle()).toMatch(/Google Phone Gallery:\s*$/);
-
-      element(by.model('query')).sendKeys('nexus');
-
-      expect(browser.getTitle()).toMatch(/Google Phone Gallery: nexus$/);
+      describe('Phone list view', function() {
+    
+        beforeEach(function() {
+          browser.get('app/index.html');
+        });
+    
+        var phoneList = element.all(by.repeater('phone in phones'));
+        var query = element(by.model('query'));
+    
+        it('should filter the phone list as user types into the search box', function() {
+          expect(phoneList.count()).toBe(3);
+    
+          query.sendKeys('nexus');
+          expect(phoneList.count()).toBe(1);
+    
+          query.clear();
+          query.sendKeys('motorola');
+          expect(phoneList.count()).toBe(2);
+        });
+    
+        it('should display the current filter value in the title bar', function() {
+          query.clear();
+          expect(browser.getTitle()).toMatch(/Google Phone Gallery:\s*$/);
+    
+          query.sendKeys('nexus');
+          expect(browser.getTitle()).toMatch(/Google Phone Gallery: nexus$/);
+        });
+      });
     });
   ```
 

docs/content/tutorial/step_06.ngdoc

@@ -73,7 +73,7 @@ __`test/e2e/scenarios.js`__:
     it('should render phone specific links', function() {
       var query = element(by.model('query'));
       query.sendKeys('nexus');
-      element(by.css('.phones li a')).click();
+      element.all(by.css('.phones li a')).first().click();
       browser.getLocationAbsUrl().then(function(url) {
         expect(url.split('#')[1]).toBe('/phones/nexus-s');
       });

docs/content/tutorial/step_07.ngdoc

@@ -80,14 +80,14 @@ AngularJS, so it's important for you to understand a thing or two about how it w
 
 When the application bootstraps, Angular creates an injector that will be used to find and inject all
 of the services that are required by your app. The injector itself doesn't know anything about what
-`$http` or `$route` services do, in fact it doesn't even know about the existence of these services 
-unless it is configured with proper module definitions. 
+`$http` or `$route` services do, in fact it doesn't even know about the existence of these services
+unless it is configured with proper module definitions.
 
-The injector only carries out the following steps : 
+The injector only carries out the following steps :
 
  * load the module definition(s) that you specify in your app
  * register all Providers defined in these module definitions
- * when asked to do so, inject a specified function and any necessary dependencies (services) that 
+ * when asked to do so, inject a specified function and any necessary dependencies (services) that
    it lazily instantiates via their Providers.
 
 Providers are objects that provide (create) instances of services and expose configuration APIs
@@ -202,7 +202,7 @@ moved the controllers into their own module `phonecatControllers` (as shown belo
 
 We added `angular-route.js` to `index.html` and created a new `phonecatControllers` module in
 `controllers.js`. That's not all we need to do to be able to use their code, however. We also have
-to add the modules dependencies of our app. By listing these two modules as dependencies of
+to add the modules as dependencies of our app. By listing these two modules as dependencies of
 `phonecatApp`, we can use the directives and services they provide.
 
 

docs/content/tutorial/step_09.ngdoc

@@ -120,7 +120,7 @@ You should now see the following output in the Karma tab:
 
 # Experiments
 
-* Let's experiment with some of the {@link ng.$filterProvider built-in Angular filters} and add the
+* Let's experiment with some of the {@link api/ng/filter built-in Angular filters} and add the
 following bindings to `index.html`:
   * `{{ "lower cap string" | uppercase }}`
   * `{{ {foo: "bar", baz: 23} | json }}`

docs/content/tutorial/step_10.ngdoc

@@ -102,6 +102,50 @@ __`test/e2e/scenarios.js`:__
 You can now rerun `npm run protractor` to see the tests run.
 
 
+You also have to refactor one of your unit tests because of the addition of the `mainImageUrl`
+model property to the `PhoneDetailCtrl` controller. Below, we create the function `xyzPhoneData`
+which returns the appropriate json with the `images` attribute in order to get the test to pass.
+
+__`test/unit/controllersSpec.js`:__
+
+```js
+...
+  beforeEach(module('phonecatApp'));
+
+...
+
+ describe('PhoneDetailCtrl', function(){
+    var scope, $httpBackend, ctrl,
+        xyzPhoneData = function() {
+          return {
+            name: 'phone xyz',
+            images: ['image/url1.png', 'image/url2.png']
+          }
+        };
+
+
+    beforeEach(inject(function(_$httpBackend_, $rootScope, $routeParams, $controller) {
+      $httpBackend = _$httpBackend_;
+      $httpBackend.expectGET('phones/xyz.json').respond(xyzPhoneData());
+
+      $routeParams.phoneId = 'xyz';
+      scope = $rootScope.$new();
+      ctrl = $controller('PhoneDetailCtrl', {$scope: scope});
+    }));
+
+
+    it('should fetch phone detail', function() {
+      expect(scope.phone).toBeUndefined();
+      $httpBackend.flush();
+
+      expect(scope.phone).toEqual(xyzPhoneData());
+    });
+  });
+```
+
+Your unit tests should now be passing.
+
+
 # Experiments
 
 * Let's add a new controller method to `PhoneDetailCtrl`:

gdocs.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 var http = require('http');
 var https = require('https');
 var fs = require('fs');
@@ -41,63 +43,63 @@ function help() {
   console.log('gdocs.js --login <username>');
   console.log('gdocs.js --fetch [<docs collection>]');
   process.exit(-1);
-};
+}
 
 
 function fetch(collection, url){
   console.log('fetching a list of docs in collection ' + collection + '...');
   request('GET', url, {
-        headers: {
-          'Gdata-Version': '3.0',
-          'Authorization': 'GoogleLogin auth=' + getAuthToken()
-        }
-      },
-      function(chunk){
-        var entries = chunk.split('<entry');
-        entries.shift();
-        entries.forEach(function(entry){
-          var title = entry.match(/<title>(.*?)<\/title>/)[1];
-          if (title.match(/\.ngdoc$/)) {
-            var exportUrl = entry.match(/<content type='text\/html' src='(.*?)'\/>/)[1];
-            download(collection, title, exportUrl);
-          };
-        });
+      headers: {
+        'Gdata-Version': '3.0',
+        'Authorization': 'GoogleLogin auth=' + getAuthToken()
       }
-    );
+    },
+    function(chunk){
+      var entries = chunk.split('<entry');
+      entries.shift();
+      entries.forEach(function(entry){
+        var title = entry.match(/<title>(.*?)<\/title>/)[1];
+        if (title.match(/\.ngdoc$/)) {
+          var exportUrl = entry.match(/<content type='text\/html' src='(.*?)'\/>/)[1];
+          download(collection, title, exportUrl);
+        }
+      });
+    }
+  );
 }
 
 function download(collection, name, url) {
   console.log('Downloading:', name, '...');
   request('GET', url + '&exportFormat=txt',
-      {
-        headers: {
-          'Gdata-Version': '3.0',
-          'Authorization': 'GoogleLogin auth=' + getAuthToken()
-        }
-      },
-      function(data){
-        data = data.replace('\ufeff', '');
-        data = data.replace(/\r\n/mg, '\n');
-
-        // strip out all text annotations
-        data = data.replace(/\[[a-zA-Z]{1,2}\]/mg, '');
-
-        // strip out all docos comments
-        data = data.replace(/^[^\s_]+:\n\S+[\S\s]*$/m, '');
-
-        // fix smart-quotes
-        data = data.replace(/[“”]/g, '"');
-        data = data.replace(/[‘’]/g, "'");
-
-
-        data = data + '\n';
-
-        //this should be a bug in Google Doc API, hence need to remove this once the bug is fixed
-        data = data.replace(/\n\n/g, '\n');
-
-        fs.writeFileSync('docs/content/' + collection + '/' + name, reflow(data, 100));
+    {
+      headers: {
+        'Gdata-Version': '3.0',
+        'Authorization': 'GoogleLogin auth=' + getAuthToken()
       }
-    );
+    },
+    function(data){
+      data = data.replace('\ufeff', '');
+      data = data.replace(/\r\n/mg, '\n');
+
+      // strip out all text annotations
+      data = data.replace(/\[[a-zA-Z]{1,2}\]/mg, '');
+
+      // strip out all docos comments
+      data = data.replace(/^[^\s_]+:\n\S+[\S\s]*$/m, '');
+
+      // fix smart-quotes
+      data = data.replace(/[“”]/g, '"');
+      data = data.replace(/[‘’]/g, "'");
+
+
+      data = data + '\n';
+
+      //this should be a bug in Google Doc API, hence need to remove this once the bug is fixed
+      data = data.replace(/\n\n/g, '\n');
+
+      fs.writeFileSync('docs/content/' + collection + '/' + name, reflow(data, 100));
+    }
+  );
 }
 
 /**
@@ -111,34 +113,34 @@ function download(collection, name, url) {
  */
 function login(username, password){
   request('POST', 'https://www.google.com/accounts/ClientLogin',
-      {
-        data: {
-          Email: username,
-          Passwd: password,
-          accountType: 'GOOGLE',
-          service: 'writely',
-          'Gdata-version': '3.0'
-        },
-        headers: {
-          'Content-type': 'application/x-www-form-urlencoded'
-        }
+    {
+      data: {
+        Email: username,
+        Passwd: password,
+        accountType: 'GOOGLE',
+        service: 'writely',
+        'Gdata-version': '3.0'
       },
-      function(chunk){
-        var token;
-        chunk.split('\n').forEach(function(line){
-          var parts = line.split('=');
-          if (parts[0] == 'Auth') {
-            token = parts[1];
-          }
-        });
-        if (token) {
-          fs.writeFileSync('tmp/gdocs.auth', token);
-          console.log("logged in, token saved in 'tmp/gdocs.auth'");
-        } else {
-          console.log('failed to log in');
-        }
+      headers: {
+        'Content-type': 'application/x-www-form-urlencoded'
       }
-    );
+    },
+    function(chunk){
+      var token;
+      chunk.split('\n').forEach(function(line){
+        var parts = line.split('=');
+        if (parts[0] == 'Auth') {
+          token = parts[1];
+        }
+      });
+      if (token) {
+        fs.writeFileSync('tmp/gdocs.auth', token);
+        console.log("logged in, token saved in 'tmp/gdocs.auth'");
+      } else {
+        console.log('failed to log in');
+      }
+    }
+  );
 }
 
 function getAuthToken() {
@@ -152,17 +154,18 @@ function getAuthToken() {
 }
 
 function request(method, url, options, response) {
-  var url = url.match(/http(s?):\/\/(.+?)(\/.*)/);
+  url = url.match(/http(s?):\/\/(.+?)(\/.*)/);
   var isHttps = url[1];
-  var request = (isHttps ? https : http).request({
+  var req = (isHttps ? https : http).request({
     host: url[2],
     port: (url[1] ? 443 : 80),
     path: url[3],
     method: method
   }, function(res){
+    var data;
     switch (res.statusCode) {
       case 200:
-        var data = [];
+        data = [];
         res.setEncoding('utf8');
         res.on('end', function () { response(data.join('')); });
         res.on('close', function () { response(data.join('')); });  // https
@@ -173,7 +176,7 @@ function request(method, url, options, response) {
         console.log('Eror: Login credentials expired! Please login.');
         break;
       default:
-        var data = [];
+        data = [];
         console.log('ERROR: ', res.statusCode);
         console.log('REQUEST URL: ', url[0]);
         console.log('REQUEST POST: ', options.data);
@@ -186,14 +189,14 @@ function request(method, url, options, response) {
     }
   });
   for(var header in options.headers) {
-    request.setHeader(header, options.headers[header]);
+    req.setHeader(header, options.headers[header]);
   }
   if (options.data)
-    request.write(encodeData(options.data));
-  request.on('end', function() {
+    req.write(encodeData(options.data));
+  req.on('end', function() {
     console.log('end');
   });
-  request.end();
+  req.end();
 }
 
 function encodeData(obj) {
@@ -215,7 +218,9 @@ function askPassword(callback) {
   stdin.on("data", function(c) {
     c = c + "";
     switch (c) {
-      case "\n": case "\r": case "\u0004":
+      case "\n":
+      case "\r":
+      case "\u0004":
         stdio.setRawMode(false);
         stdin.pause();
         callback(password);
@@ -227,7 +232,7 @@ function askPassword(callback) {
         password += c;
         break;
     }
-  })
+  });
 
 }
 

karma-docs.conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var sharedConfig = require('./karma-shared.conf');
 
 module.exports = function(config) {

karma-jqlite.conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var angularFiles = require('./angularFiles');
 var sharedConfig = require('./karma-shared.conf');
 
@@ -5,12 +7,7 @@ module.exports = function(config) {
   sharedConfig(config, {testName: 'AngularJS: jqLite', logFile: 'karma-jqlite.log'});
 
   config.set({
-    files: angularFiles.mergeFilesFor('karma').concat({
-      pattern: "test/fixtures/**/*.html",
-      served: true,
-      watched: true,
-      included: false
-    }),
+    files: angularFiles.mergeFilesFor('karma'),
     exclude: angularFiles.mergeFilesFor('karmaExclude'),
 
     junitReporter: {

karma-jquery.conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var angularFiles = require('./angularFiles');
 var sharedConfig = require('./karma-shared.conf');
 
@@ -5,12 +7,7 @@ module.exports = function(config) {
   sharedConfig(config, {testName: 'AngularJS: jQuery', logFile: 'karma-jquery.log'});
 
   config.set({
-    files: angularFiles.mergeFilesFor('karmaJquery').concat({
-      pattern: "test/fixtures/**/*.html",
-      served: true,
-      watched: true,
-      included: false
-    }),
+    files: angularFiles.mergeFilesFor('karmaJquery'),
     exclude: angularFiles.mergeFilesFor('karmaJqueryExclude'),
 
     junitReporter: {

karma-modules.conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var angularFiles = require('./angularFiles');
 var sharedConfig = require('./karma-shared.conf');
 

karma-shared.conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function(config, specificOptions) {
   config.set({
     frameworks: ['jasmine'],
@@ -170,7 +172,7 @@ module.exports = function(config, specificOptions) {
 
       // ignore web-server's 404s
       if (log.categoryName === 'web-server' && log.level.levelStr === config.LOG_WARN &&
-          IGNORED_404.some(function(ignoredLog) {return msg.indexOf(ignoredLog) !== -1})) {
+          IGNORED_404.some(function(ignoredLog) {return msg.indexOf(ignoredLog) !== -1;})) {
         return;
       }
 

lib/browser-stack/start-tunnel.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var fs = require('fs');
 var http = require('http');
 var BrowserStackTunnel = require('browserstacktunnel-wrapper');

lib/grunt/plugins.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var bower = require('bower');
 var util = require('./utils.js');
 var shelljs = require('shelljs');

lib/grunt/utils.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var fs = require('fs');
 var path = require('path');
 var shell = require('shelljs');

lib/promises-aplus/promises-aplus-test-adapter.js

@@ -1,4 +1,8 @@
-var isFunction = function isFunction(value){return typeof value == 'function';}
+/* global qFactory: false */
+'use strict';
+
+var isFunction = function isFunction(value){return typeof value == 'function';};
+var isPromiseLike = function isPromiseLike(obj) {return obj && isFunction(obj.then);};
 
 var $q = qFactory(process.nextTick, function noopExceptionHandler() {});
 

lib/sauce/sauce_connect_setup.sh

@@ -12,9 +12,9 @@ set -e
 # before_script:
 #   - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
 
-CONNECT_URL="http://saucelabs.com/downloads/Sauce-Connect-latest.zip"
+CONNECT_URL="https://d2nkw87yt5k0to.cloudfront.net/downloads/sc-4.3-linux.tar.gz"
 CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
-CONNECT_DOWNLOAD="Sauce_Connect.zip"
+CONNECT_DOWNLOAD="sc-4.3-linux.tar.gz"
 
 CONNECT_LOG="$LOGS_DIR/sauce-connect"
 CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
@@ -24,7 +24,8 @@ CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr"
 mkdir -p $CONNECT_DIR
 cd $CONNECT_DIR
 curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
-unzip $CONNECT_DOWNLOAD > /dev/null
+mkdir sauce-connect
+tar --extract --file=$CONNECT_DOWNLOAD --strip-components=1 --directory=sauce-connect > /dev/null
 rm $CONNECT_DOWNLOAD
 
 SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
@@ -45,5 +46,5 @@ echo "Starting Sauce Connect in the background, logging into:"
 echo "  $CONNECT_LOG"
 echo "  $CONNECT_STDOUT"
 echo "  $CONNECT_STDERR"
-java -jar Sauce-Connect.jar $ARGS $SAUCE_USERNAME $SAUCE_ACCESS_KEY \
+sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS -v \
   --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &

lib/versions/version-info.js

@@ -1,10 +1,12 @@
+'use strict';
+
 var fs = require('fs');
 var path = require('path');
 var shell = require('shelljs');
 var semver = require('semver');
 var _ = require('lodash');
 
-var currentPackage, previousVersions, cdnVersion;
+var currentPackage, previousVersions, cdnVersion, gitRepoInfo;
 
 
 /**
@@ -154,14 +156,14 @@ var getCdnVersion = function() {
       }
       return cdnVersion;
     }, null);
-}
+};
 
 /**
  * Get the unstable snapshot version
  * @return {SemVer} The snapshot version
  */
 var getSnapshotVersion = function() {
-  version = _(previousVersions)
+  var version = _(previousVersions)
     .filter(function(tag) {
       return semver.satisfies(tag, currentPackage.branchVersion);
     })

npm-shrinkwrap.json

@@ -502,7 +502,7 @@
       }
     },
     "dgeni-packages": {
-      "version": "0.9.1",
+      "version": "0.9.7",
       "dependencies": {
         "lodash": {
           "version": "2.4.1"
@@ -511,10 +511,13 @@
           "version": "2.0.3"
         },
         "glob": {
-          "version": "3.2.9",
+          "version": "3.2.11",
           "dependencies": {
+            "inherits": {
+              "version": "2.0.1"
+            },
             "minimatch": {
-              "version": "0.2.14",
+              "version": "0.3.0",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0"
@@ -523,9 +526,6 @@
                   "version": "1.0.0"
                 }
               }
-            },
-            "inherits": {
-              "version": "2.0.1"
             }
           }
         },
@@ -539,7 +539,7 @@
                   "version": "0.0.2"
                 },
                 "minimist": {
-                  "version": "0.0.8"
+                  "version": "0.0.10"
                 }
               }
             },
@@ -565,7 +565,7 @@
           "version": "0.7.1"
         },
         "esprima": {
-          "version": "1.2.0"
+          "version": "1.2.2"
         },
         "change-case": {
           "version": "2.1.1",
@@ -865,22 +865,22 @@
       "version": "0.4.1"
     },
     "grunt-contrib-jshint": {
-      "version": "0.7.2",
+      "version": "0.10.0",
       "dependencies": {
         "jshint": {
-          "version": "2.3.0",
+          "version": "2.5.2",
           "dependencies": {
             "shelljs": {
-              "version": "0.1.4"
+              "version": "0.3.0"
             },
             "underscore": {
-              "version": "1.4.4"
+              "version": "1.6.0"
             },
             "cli": {
-              "version": "0.4.5",
+              "version": "0.6.3",
               "dependencies": {
                 "glob": {
-                  "version": "3.2.9",
+                  "version": "3.2.11",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1"
@@ -890,7 +890,7 @@
               }
             },
             "minimatch": {
-              "version": "0.2.14",
+              "version": "0.3.0",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0"
@@ -900,10 +900,58 @@
                 }
               }
             },
+            "htmlparser2": {
+              "version": "3.7.2",
+              "dependencies": {
+                "domhandler": {
+                  "version": "2.2.0"
+                },
+                "domutils": {
+                  "version": "1.5.0"
+                },
+                "domelementtype": {
+                  "version": "1.1.1"
+                },
+                "readable-stream": {
+                  "version": "1.1.13-1",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.25-1"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "entities": {
+                  "version": "1.0.0"
+                }
+              }
+            },
             "console-browserify": {
-              "version": "0.1.6"
+              "version": "1.1.0",
+              "dependencies": {
+                "date-now": {
+                  "version": "0.1.4"
+                }
+              }
+            },
+            "exit": {
+              "version": "0.1.2"
+            },
+            "strip-json-comments": {
+              "version": "0.1.3"
             }
           }
+        },
+        "hooker": {
+          "version": "0.2.3"
         }
       }
     },
@@ -2690,7 +2738,7 @@
       }
     },
     "protractor": {
-      "version": "1.0.0-rc4",
+      "version": "1.0.0",
       "dependencies": {
         "request": {
           "version": "2.36.0",
@@ -2714,7 +2762,7 @@
               "version": "0.12.1",
               "dependencies": {
                 "punycode": {
-                  "version": "1.2.4"
+                  "version": "1.3.0"
                 }
               }
             },
@@ -2783,7 +2831,7 @@
           "version": "1.1.1"
         },
         "jasminewd": {
-          "version": "1.0.3"
+          "version": "1.0.4"
         },
         "saucelabs": {
           "version": "0.1.1"
@@ -2825,7 +2873,7 @@
           "version": "2.4.1"
         },
         "source-map-support": {
-          "version": "0.2.6",
+          "version": "0.2.7",
           "dependencies": {
             "source-map": {
               "version": "0.1.32",

package.json

@@ -12,7 +12,7 @@
     "grunt-contrib-connect": "~0.5.0",
     "grunt-contrib-compress": "~0.5.2",
     "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-jshint": "~0.7.2",
+    "grunt-contrib-jshint": "~0.10.0",
     "grunt-ddescribe-iit": "~0.0.1",
     "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
     "grunt-jscs-checker": "~0.4.0",
@@ -33,7 +33,7 @@
     "karma-sauce-launcher": "0.2.0",
     "karma-script-launcher": "0.1.0",
     "karma-browserstack-launcher": "0.0.7",
-    "protractor": "1.0.0-rc4",
+    "protractor": "1.0.0",
     "yaml-js": "~0.0.8",
     "rewire": "1.1.3",
     "promises-aplus-tests": "~1.3.2",
@@ -48,7 +48,7 @@
     "canonical-path": "0.0.2",
     "winston": "~0.7.2",
     "dgeni": "^0.3.0",
-    "dgeni-packages": "^0.9.1",
+    "dgeni-packages": "^0.9.7",
     "gulp-jshint": "~1.4.2",
     "jshint-stylish": "~0.1.5",
     "node-html-encoder": "0.0.2",

protractor-conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var config = require('./protractor-shared-conf').config;
 
 config.specs = [

protractor-jenkins-conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 exports.config = {
   allScriptsTimeout: 11000,
 
@@ -15,6 +17,8 @@ exports.config = {
   framework: 'jasmine',
 
   onPrepare: function() {
+    /* global angular: false, browser: false, jasmine: false */
+
     // Disable animations so e2e tests run more quickly
     var disableNgAnimate = function() {
       angular.module('disableNgAnimate', []).run(function($animate) {

protractor-shared-conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 exports.config = {
   allScriptsTimeout: 11000,
 
@@ -6,6 +8,8 @@ exports.config = {
   framework: 'jasmine',
 
   onPrepare: function() {
+    /* global angular: false, browser: false, jasmine: false */
+
     // Disable animations so e2e tests run more quickly
     var disableNgAnimate = function() {
       angular.module('disableNgAnimate', []).run(function($animate) {

protractor-travis-conf.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var config = require('./protractor-shared-conf').config;
 
 config.sauceUser = process.env.SAUCE_USERNAME;
@@ -5,9 +7,11 @@ config.sauceKey = process.env.SAUCE_ACCESS_KEY;
 
 config.multiCapabilities = [{
   'browserName': 'chrome',
+  'platform': 'OS X 10.9',
   'name': 'Angular E2E',
   'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
-  'build': process.env.TRAVIS_BUILD_NUMBER
+  'build': process.env.TRAVIS_BUILD_NUMBER,
+  'version': '34'
 }, {
   'browserName': 'firefox',
   'name': 'Angular E2E',
@@ -23,4 +27,7 @@ config.multiCapabilities = [{
   'build': process.env.TRAVIS_BUILD_NUMBER
 }];
 
+config.allScriptsTimeout = 30000;
+config.getPageTimeout = 30000;
+
 exports.config = config;

scripts/travis/npm-bundle-deps.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+# normalize the working dir to the directory of the script
+cd $(dirname $0);
+
+cd ../..
+curl "http://23.251.148.50:8000/tar/$TRAVIS_REPO_SLUG/$TRAVIS_COMMIT" | tar xz || true

src/.jshintrc

@@ -1,20 +1,5 @@
 {
-  "bitwise": true,
-  "immed": true,
-  "newcap": true,
-  "noarg": true,
-  "noempty": true,
-  "nonew": true,
-  "trailing": true,
-  "maxlen": 200,
-  "boss": true,
-  "eqnull": true,
-  "expr": true,
-  "globalstrict": true,
-  "laxbreak": true,
-  "loopfunc": true,
-  "sub": true,
-  "undef": true,
+  "extends": "../.jshintrc-base",
   "browser": true,
   "globals": {
     /* auto/injector.js */
@@ -65,6 +50,7 @@
     "isFile": false,
     "isBlob": false,
     "isBoolean": false,
+    "isPromiseLike": false,
     "trim": false,
     "isElement": false,
     "makeMap": false,
@@ -106,7 +92,7 @@
     "version": false,
     "publishExternalAPI": false,
 
-    /* minerr.js */
+    /* minErr.js */
     "minErr": false,
 
     /* loader.js */

src/Angular.js

@@ -1,89 +1,88 @@
 'use strict';
 
 /* We need to tell jshint what variables are being exported */
-/* global
-    -angular,
-    -msie,
-    -jqLite,
-    -jQuery,
-    -slice,
-    -push,
-    -toString,
-    -ngMinErr,
-    -angularModule,
-    -nodeName_,
-    -uid,
-    -VALIDITY_STATE_PROPERTY,
-
-    -lowercase,
-    -uppercase,
-    -manualLowercase,
-    -manualUppercase,
-    -nodeName_,
-    -isArrayLike,
-    -forEach,
-    -sortedKeys,
-    -forEachSorted,
-    -reverseParams,
-    -nextUid,
-    -setHashKey,
-    -extend,
-    -int,
-    -inherit,
-    -noop,
-    -identity,
-    -valueFn,
-    -isUndefined,
-    -isDefined,
-    -isObject,
-    -isString,
-    -isNumber,
-    -isDate,
-    -isArray,
-    -isFunction,
-    -isRegExp,
-    -isWindow,
-    -isScope,
-    -isFile,
-    -isBlob,
-    -isBoolean,
-    -trim,
-    -isElement,
-    -makeMap,
-    -map,
-    -size,
-    -includes,
-    -indexOf,
-    -arrayRemove,
-    -isLeafNode,
-    -copy,
-    -shallowCopy,
-    -equals,
-    -csp,
-    -concat,
-    -sliceArgs,
-    -bind,
-    -toJsonReplacer,
-    -toJson,
-    -fromJson,
-    -toBoolean,
-    -startingTag,
-    -tryDecodeURIComponent,
-    -parseKeyValue,
-    -toKeyValue,
-    -encodeUriSegment,
-    -encodeUriQuery,
-    -angularInit,
-    -bootstrap,
-    -snake_case,
-    -bindJQuery,
-    -assertArg,
-    -assertArgFn,
-    -assertNotHasOwnProperty,
-    -getter,
-    -getBlockElements,
-    -hasOwnProperty,
+/* global angular: true,
+    msie: true,
+    jqLite: true,
+    jQuery: true,
+    slice: true,
+    push: true,
+    toString: true,
+    ngMinErr: true,
+    angularModule: true,
+    nodeName_: true,
+    uid: true,
+    VALIDITY_STATE_PROPERTY: true,
 
+    lowercase: true,
+    uppercase: true,
+    manualLowercase: true,
+    manualUppercase: true,
+    nodeName_: true,
+    isArrayLike: true,
+    forEach: true,
+    sortedKeys: true,
+    forEachSorted: true,
+    reverseParams: true,
+    nextUid: true,
+    setHashKey: true,
+    extend: true,
+    int: true,
+    inherit: true,
+    noop: true,
+    identity: true,
+    valueFn: true,
+    isUndefined: true,
+    isDefined: true,
+    isObject: true,
+    isString: true,
+    isNumber: true,
+    isDate: true,
+    isArray: true,
+    isFunction: true,
+    isRegExp: true,
+    isWindow: true,
+    isScope: true,
+    isFile: true,
+    isBlob: true,
+    isBoolean: true,
+    isPromiseLike: true,
+    trim: true,
+    isElement: true,
+    makeMap: true,
+    map: true,
+    size: true,
+    includes: true,
+    indexOf: true,
+    arrayRemove: true,
+    isLeafNode: true,
+    copy: true,
+    shallowCopy: true,
+    equals: true,
+    csp: true,
+    concat: true,
+    sliceArgs: true,
+    bind: true,
+    toJsonReplacer: true,
+    toJson: true,
+    fromJson: true,
+    toBoolean: true,
+    startingTag: true,
+    tryDecodeURIComponent: true,
+    parseKeyValue: true,
+    toKeyValue: true,
+    encodeUriSegment: true,
+    encodeUriQuery: true,
+    angularInit: true,
+    bootstrap: true,
+    snake_case: true,
+    bindJQuery: true,
+    assertArg: true,
+    assertArgFn: true,
+    assertNotHasOwnProperty: true,
+    getter: true,
+    getBlockElements: true,
+    hasOwnProperty: true,
 */
 
 ////////////////////////////////////
@@ -242,11 +241,12 @@ function forEach(obj, iterator, context) {
           iterator.call(context, obj[key], key);
         }
       }
-    } else if (obj.forEach && obj.forEach !== forEach) {
-      obj.forEach(iterator, context);
-    } else if (isArrayLike(obj)) {
-      for (key = 0; key < obj.length; key++)
+    } else if (isArray(obj) || isArrayLike(obj)) {
+      for (key = 0; key < obj.length; key++) {
         iterator.call(context, obj[key], key);
+      }
+    } else if (obj.forEach && obj.forEach !== forEach) {
+        obj.forEach(iterator, context);
     } else {
       for (key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -583,6 +583,11 @@ function isBoolean(value) {
 }
 
 
+function isPromiseLike(obj) {
+  return obj && isFunction(obj.then);
+}
+
+
 var trim = (function() {
   // native trim is way faster: http://jsperf.com/angular-trim-test
   // but IE doesn't have it... :-(
@@ -747,7 +752,7 @@ function isLeafNode (node) {
  </div>
 
  <script>
-  angular.module('copyExample')
+  angular.module('copyExample', [])
     .controller('ExampleController', ['$scope', function($scope) {
       $scope.master= {};
 
@@ -781,7 +786,8 @@ function copy(source, destination, stackSource, stackDest) {
       } else if (isDate(source)) {
         destination = new Date(source.getTime());
       } else if (isRegExp(source)) {
-        destination = new RegExp(source.source);
+        destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
+        destination.lastIndex = source.lastIndex;
       } else if (isObject(source)) {
         destination = copy(source, {}, stackSource, stackDest);
       }
@@ -925,12 +931,25 @@ function equals(o1, o2) {
   return false;
 }
 
+var csp = function() {
+  if (isDefined(csp.isActive_)) return csp.isActive_;
+
+  var active = !!(document.querySelector('[ng-csp]') ||
+                  document.querySelector('[data-ng-csp]'));
+
+  if (!active) {
+    try {
+      /* jshint -W031, -W054 */
+      new Function('');
+      /* jshint +W031, +W054 */
+    } catch (e) {
+      active = true;
+    }
+  }
+
+  return (csp.isActive_ = active);
+};
 
-function csp() {
-  return (document.securityPolicy && document.securityPolicy.isActive) ||
-      (document.querySelector &&
-      !!(document.querySelector('[ng-csp]') || document.querySelector('[data-ng-csp]')));
-}
 
 
 function concat(array1, array2, index) {
@@ -1102,7 +1121,7 @@ function parseKeyValue(/**string*/keyValue) {
   var obj = {}, key_value, key;
   forEach((keyValue || "").split('&'), function(keyValue) {
     if ( keyValue ) {
-      key_value = keyValue.split('=');
+      key_value = keyValue.replace(/\+/g,'%20').split('=');
       key = tryDecodeURIComponent(key_value[0]);
       if ( isDefined(key) ) {
         var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;

src/AngularPublic.js

@@ -1,11 +1,10 @@
 'use strict';
 
-/* global
-    angularModule: true,
-    version: true,
+/* global angularModule: true,
+  version: true,
 
-    $LocaleProvider,
-    $CompileProvider,
+  $LocaleProvider,
+  $CompileProvider,
 
     htmlAnchorDirective,
     inputDirective,
@@ -110,11 +109,11 @@ function publishExternalAPI(angular){
     'element': jqLite,
     'forEach': forEach,
     'injector': createInjector,
-    'noop':noop,
-    'bind':bind,
+    'noop': noop,
+    'bind': bind,
     'toJson': toJson,
     'fromJson': fromJson,
-    'identity':identity,
+    'identity': identity,
     'isUndefined': isUndefined,
     'isDefined': isDefined,
     'isString': isString,

src/jqLite.js

@@ -1,11 +1,9 @@
 'use strict';
 
-/* global
-
-  -JQLitePrototype,
-  -addEventListenerFn,
-  -removeEventListenerFn,
-  -BOOLEAN_ATTR
+/* global JQLitePrototype: true,
+  addEventListenerFn: true,
+  removeEventListenerFn: true,
+  BOOLEAN_ATTR: true
 */
 
 //////////////////////////////////
@@ -419,25 +417,22 @@ function jqLiteController(element, name) {
 }
 
 function jqLiteInheritedData(element, name, value) {
-  element = jqLite(element);
-
   // if element is the document object work with the html element instead
   // this makes $(document).scope() possible
-  if(element[0].nodeType == 9) {
-    element = element.find('html');
+  if(element.nodeType == 9) {
+    element = element.documentElement;
   }
   var names = isArray(name) ? name : [name];
 
-  while (element.length) {
-    var node = element[0];
+  while (element) {
     for (var i = 0, ii = names.length; i < ii; i++) {
-      if ((value = element.data(names[i])) !== undefined) return value;
+      if ((value = jqLite.data(element, names[i])) !== undefined) return value;
     }
 
     // If dealing with a document fragment node with a host element, and no parent, use the host
     // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM
     // to lookup parent controllers.
-    element = jqLite(node.parentNode || (node.nodeType === 11 && node.host));
+    element = element.parentNode || (element.nodeType === 11 && element.host);
   }
 }
 
@@ -512,18 +507,25 @@ function getBooleanAttrName(element, name) {
   return booleanAttr && BOOLEAN_ELEMENTS[element.nodeName] && booleanAttr;
 }
 
+forEach({
+  data: jqLiteData,
+  removeData: jqLiteRemoveData
+}, function(fn, name) {
+  JQLite[name] = fn;
+});
+
 forEach({
   data: jqLiteData,
   inheritedData: jqLiteInheritedData,
 
   scope: function(element) {
     // Can't use jqLiteData here directly so we stay compatible with jQuery!
-    return jqLite(element).data('$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
+    return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
   },
 
   isolateScope: function(element) {
     // Can't use jqLiteData here directly so we stay compatible with jQuery!
-    return jqLite(element).data('$isolateScope') || jqLite(element).data('$isolateScopeNoTemplate');
+    return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate');
   },
 
   controller: jqLiteController,
@@ -950,19 +952,37 @@ forEach({
 
   clone: jqLiteClone,
 
-  triggerHandler: function(element, eventName, eventData) {
+  triggerHandler: function(element, event, extraParameters) {
+
+    var dummyEvent, eventFnsCopy, handlerArgs;
+    var eventName = event.type || event;
     var eventFns = (jqLiteExpandoStore(element, 'events') || {})[eventName];
 
-    eventData = eventData || [];
+    if (eventFns) {
 
-    var event = [{
-      preventDefault: noop,
-      stopPropagation: noop
-    }];
+      // Create a dummy event to pass to the handlers
+      dummyEvent = {
+        preventDefault: function() { this.defaultPrevented = true; },
+        isDefaultPrevented: function() { return this.defaultPrevented === true; },
+        stopPropagation: noop,
+        type: eventName,
+        target: element
+      };
 
-    forEach(eventFns, function(fn) {
-      fn.apply(element, event.concat(eventData));
-    });
+      // If a custom event was provided then extend our dummy event with it
+      if (event.type) {
+        dummyEvent = extend(dummyEvent, event);
+      }
+
+      // Copy event handlers in case event handlers array is modified during execution.
+      eventFnsCopy = shallowCopy(eventFns);
+      handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent];
+
+      forEach(eventFnsCopy, function(fn) {
+        fn.apply(element, handlerArgs);
+      });
+
+    }
   }
 }, function(fn, name){
   /**

src/ng/compile.js

@@ -213,14 +213,16 @@
  *
  *
  * #### `template`
- * replace the current element with the contents of the HTML. The replacement process
- * migrates all of the attributes / classes from the old element to the new one. See the
- * {@link guide/directive#creating-custom-directives_creating-directives_template-expanding-directive
- * Directives Guide} for an example.
+ * HTML markup that may:
+ * * Replace the contents of the directive's element (default).
+ * * Replace the directive's element itself (if `replace` is true - DEPRECATED).
+ * * Wrap the contents of the directive's element (if `transclude` is true).
  *
- * You can specify `template` as a string representing the template or as a function which takes
- * two arguments `tElement` and `tAttrs` (described in the `compile` function api below) and
- * returns a string value representing the template.
+ * Value may be:
+ *
+ * * A string. For example `<div red-on-hover>{{delete_str}}</div>`.
+ * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile`
+ *   function api below) and returns a string value.
  *
  *
  * #### `templateUrl`
@@ -235,11 +237,14 @@
  *
  *
  * #### `replace` ([*DEPRECATED*!], will be removed in next major release)
- * specify where the template should be inserted. Defaults to `false`.
+ * specify what the template should replace. Defaults to `false`.
  *
- * * `true` - the template will replace the current element.
- * * `false` - the template will replace the contents of the current element.
+ * * `true` - the template will replace the directive's element.
+ * * `false` - the template will replace the contents of the directive's element.
  *
+ * The replacement process migrates all of the attributes / classes from the old element to the new
+ * one. See the {@link guide/directive#creating-custom-directives_creating-directives_template-expanding-directive
+ * Directives Guide} for an example.
  *
  * #### `transclude`
  * compile the content of the element and make it available to the directive.
@@ -253,6 +258,11 @@
  * * `true` - transclude the content of the directive.
  * * `'element'` - transclude the whole element including any directives defined at lower priority.
  *
+ * <div class="alert alert-warning">
+ * **Note:** When testing an element transclude directive you must not place the directive at the root of the
+ * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives
+ * Testing Transclusion Directives}.
+ * </div>
  *
  * #### `compile`
  *
@@ -898,7 +908,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
             : null;
 
         if (nodeLinkFn && nodeLinkFn.scope) {
-          safeAddClass(jqLite(nodeList[i]), 'ng-scope');
+          safeAddClass(attrs.$$element, 'ng-scope');
         }
 
         childLinkFn = (nodeLinkFn && nodeLinkFn.terminal ||
@@ -920,7 +930,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       return linkFnFound ? compositeLinkFn : null;
 
       function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) {
-        var nodeLinkFn, childLinkFn, node, $node, childScope, i, ii, n, childBoundTranscludeFn;
+        var nodeLinkFn, childLinkFn, node, childScope, i, ii, n, childBoundTranscludeFn;
 
         // copy nodeList so that linking doesn't break due to live list updates.
         var nodeListLength = nodeList.length,
@@ -933,12 +943,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           node = stableNodeList[n];
           nodeLinkFn = linkFns[i++];
           childLinkFn = linkFns[i++];
-          $node = jqLite(node);
 
           if (nodeLinkFn) {
             if (nodeLinkFn.scope) {
               childScope = scope.$new();
-              $node.data('$scope', childScope);
+              jqLite.data(node, '$scope', childScope);
             } else {
               childScope = scope;
             }
@@ -1230,12 +1239,12 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           if (directiveValue == 'element') {
             hasElementTranscludeDirective = true;
             terminalPriority = directive.priority;
-            $template = groupScan(compileNode, attrStart, attrEnd);
+            $template = $compileNode;
             $compileNode = templateAttrs.$$element =
                 jqLite(document.createComment(' ' + directiveName + ': ' +
                                               templateAttrs[directiveName] + ' '));
             compileNode = $compileNode[0];
-            replaceWith(jqCollection, jqLite(sliceArgs($template)), compileNode);
+            replaceWith(jqCollection, sliceArgs($template), compileNode);
 
             childTranscludeFn = compile($template, transcludeFn, terminalPriority,
                                         replaceDirective && replaceDirective.name, {
@@ -1412,29 +1421,26 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) {
         var attrs, $element, i, ii, linkFn, controller, isolateScope, elementControllers = {}, transcludeFn;
 
-        if (compileNode === linkNode) {
-          attrs = templateAttrs;
-        } else {
-          attrs = shallowCopy(templateAttrs, new Attributes(jqLite(linkNode), templateAttrs.$attr));
-        }
+        attrs = (compileNode === linkNode)
+          ? templateAttrs
+          : shallowCopy(templateAttrs, new Attributes(jqLite(linkNode), templateAttrs.$attr));
         $element = attrs.$$element;
 
         if (newIsolateScopeDirective) {
           var LOCAL_REGEXP = /^\s*([@=&])(\??)\s*(\w*)\s*$/;
-          var $linkNode = jqLite(linkNode);
 
           isolateScope = scope.$new(true);
 
           if (templateDirective && (templateDirective === newIsolateScopeDirective ||
               templateDirective === newIsolateScopeDirective.$$originalDirective)) {
-            $linkNode.data('$isolateScope', isolateScope) ;
+            $element.data('$isolateScope', isolateScope);
           } else {
-            $linkNode.data('$isolateScopeNoTemplate', isolateScope);
+            $element.data('$isolateScopeNoTemplate', isolateScope);
           }
 
 
 
-          safeAddClass($linkNode, 'ng-isolate-scope');
+          safeAddClass($element, 'ng-isolate-scope');
 
           forEach(newIsolateScopeDirective.scope, function(definition, scopeName) {
             var match = definition.match(LOCAL_REGEXP) || [],
@@ -1468,7 +1474,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                 if (parentGet.literal) {
                   compare = equals;
                 } else {
-                  compare = function(a,b) { return a === b; };
+                  compare = function(a,b) { return a === b || (a !== a && b !== b); };
                 }
                 parentSet = parentGet.assign || function() {
                   // reset the change, or we will throw this exception on every $digest

src/ng/directive/input.js

@@ -1,11 +1,9 @@
 'use strict';
 
-/* global
-
-    -VALID_CLASS,
-    -INVALID_CLASS,
-    -PRISTINE_CLASS,
-    -DIRTY_CLASS
+/* global VALID_CLASS: true,
+    INVALID_CLASS: true,
+    PRISTINE_CLASS: true,
+    DIRTY_CLASS: true
 */
 
 var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;

src/ng/directive/ngBind.js

@@ -13,7 +13,7 @@
  * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
  * `{{ expression }}` which is similar but less verbose.
  *
- * It is preferable to use `ngBind` instead of `{{ expression }}` when a template is momentarily
+ * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily
  * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
  * element attribute, it makes the bindings invisible to the user while the page is loading.
  *
@@ -177,14 +177,23 @@ var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
    </example>
  */
 var ngBindHtmlDirective = ['$sce', '$parse', function($sce, $parse) {
-  return function(scope, element, attr) {
-    element.addClass('ng-binding').data('$binding', attr.ngBindHtml);
+  return {
+    compile: function (tElement) {
+      tElement.addClass('ng-binding');
 
-    var parsed = $parse(attr.ngBindHtml);
-    function getStringValue() { return (parsed(scope) || '').toString(); }
+      return function (scope, element, attr) {
+        element.data('$binding', attr.ngBindHtml);
 
-    scope.$watch(getStringValue, function ngBindHtmlWatchAction(value) {
-      element.html($sce.getTrustedHtml(parsed(scope)) || '');
-    });
+        var parsed = $parse(attr.ngBindHtml);
+
+        function getStringValue() {
+          return (parsed(scope) || '').toString();
+        }
+
+        scope.$watch(getStringValue, function ngBindHtmlWatchAction(value) {
+          element.html($sce.getTrustedHtml(parsed(scope)) || '');
+        });
+      };
+    }
   };
 }];

src/ng/directive/ngCsp.js

@@ -11,8 +11,10 @@
  * This is necessary when developing things like Google Chrome Extensions.
  *
  * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
- * For us to be compatible, we just need to implement the "getterFn" in $parse without violating
- * any of these restrictions.
+ * For Angular to be CSP compatible there are only two things that we need to do differently:
+ *
+ * - don't use `Function` constructor to generate optimized value getters
+ * - don't inject custom stylesheet into the document
  *
  * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
  * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
@@ -23,7 +25,18 @@
  * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
  * To make those directives work in CSP mode, include the `angular-csp.css` manually.
  *
- * In order to use this feature put the `ngCsp` directive on the root element of the application.
+ * Angular tries to autodetect if CSP is active and automatically turn on the CSP-safe mode. This
+ * autodetection however triggers a CSP error to be logged in the console:
+ *
+ * ```
+ * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
+ * script in the following Content Security Policy directive: "default-src 'self'". Note that
+ * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
+ * ```
+ *
+ * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
+ * directive on the root element of the application or on the `angular.js` script tag, whichever
+ * appears first in the html document.
  *
  * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
  *
@@ -38,6 +51,6 @@
    ```
  */
 
-// ngCsp is not implemented as a proper directive any more, because we need it be processed while we bootstrap
-// the system (before $parse is instantiated), for this reason we just have a csp() fn that looks for ng-csp attribute
-// anywhere in the current doc
+// ngCsp is not implemented as a proper directive any more, because we need it be processed while we
+// bootstrap the system (before $parse is instantiated), for this reason we just have
+// the csp.isActive() fn that looks for ng-csp attribute anywhere in the current doc

src/ng/directive/ngEventDirs.js

@@ -307,6 +307,13 @@ forEach(
  * server and reloading the current page), but only if the form does not contain `action`,
  * `data-action`, or `x-action` attributes.
  *
+ * <div class="alert alert-warning">
+ * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
+ * `ngSubmit` handlers together. See the
+ * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
+ * for a detailed discussion of when `ngSubmit` may be triggered.
+ * </div>
+ *
  * @element form
  * @priority 0
  * @param {expression} ngSubmit {@link guide/expression Expression} to eval.

src/ng/directive/select.js

@@ -395,21 +395,37 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                   value = valueFn(scope, locals);
                 }
               }
-              // Update the null option's selected property here so $render cleans it up correctly
-              if (optionGroupsCache[0].length > 1) {
-                if (optionGroupsCache[0][1].id !== key) {
-                  optionGroupsCache[0][1].selected = false;
-                }
-              }
             }
             ctrl.$setViewValue(value);
+            render();
           });
         });
 
         ctrl.$render = render;
 
-        // TODO(vojta): can't we optimize this ?
-        scope.$watch(render);
+        scope.$watchCollection(valuesFn, render);
+        if ( multiple ) {
+          scope.$watchCollection(function() { return ctrl.$modelValue; }, render);
+        }
+
+        function getSelectedSet() {
+          var selectedSet = false;
+          if (multiple) {
+            var modelValue = ctrl.$modelValue;
+            if (trackFn && isArray(modelValue)) {
+              selectedSet = new HashMap([]);
+              var locals = {};
+              for (var trackIndex = 0; trackIndex < modelValue.length; trackIndex++) {
+                locals[valueName] = modelValue[trackIndex];
+                selectedSet.put(trackFn(scope, locals), modelValue[trackIndex]);
+              }
+            } else {
+              selectedSet = new HashMap(modelValue);
+            }
+          }
+          return selectedSet;
+        }
+
 
         function render() {
               // Temporary location for the option groups before we render them
@@ -427,22 +443,11 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
               groupIndex, index,
               locals = {},
               selected,
-              selectedSet = false, // nothing is selected yet
+              selectedSet = getSelectedSet(),
               lastElement,
               element,
               label;
 
-          if (multiple) {
-            if (trackFn && isArray(modelValue)) {
-              selectedSet = new HashMap([]);
-              for (var trackIndex = 0; trackIndex < modelValue.length; trackIndex++) {
-                locals[valueName] = modelValue[trackIndex];
-                selectedSet.put(trackFn(scope, locals), modelValue[trackIndex]);
-              }
-            } else {
-              selectedSet = new HashMap(modelValue);
-            }
-          }
 
           // We now build up the list of options we need (we merge later)
           for (index = 0; length = keys.length, index < length; index++) {
@@ -538,8 +543,14 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                   lastElement.val(existingOption.id = option.id);
                 }
                 // lastElement.prop('selected') provided by jQuery has side-effects
-                if (existingOption.selected !== option.selected) {
+                if (lastElement[0].selected !== option.selected) {
                   lastElement.prop('selected', (existingOption.selected = option.selected));
+                  if (msie) {
+                    // See #7692
+                    // The selected item wouldn't visually update on IE without this.
+                    // Tested on Win7: IE9, IE10 and IE11. Future IEs should be tested as well
+                    lastElement.prop('selected', existingOption.selected);
+                  }
                 }
               } else {
                 // grow elements
@@ -555,6 +566,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                   (element = optionTemplate.clone())
                       .val(option.id)
                       .prop('selected', option.selected)
+                      .attr('selected', option.selected)
                       .text(option.label);
                 }
 

src/ng/filter.js

@@ -1,5 +1,16 @@
 'use strict';
 
+/* global currencyFilter: true,
+ dateFilter: true,
+ filterFilter: true,
+ jsonFilter: true,
+ limitToFilter: true,
+ lowercaseFilter: true,
+ numberFilter: true,
+ orderByFilter: true,
+ uppercaseFilter: true,
+ */
+
 /**
  * @ngdoc provider
  * @name $filterProvider

src/ng/filter/filters.js

@@ -327,7 +327,7 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+
  *   (e.g. `"h 'o''clock'"`).
  *
  * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
- *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.SSSZ and its
+ *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its
  *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
  *    specified in the string input, the time is considered to be in the local timezone.
  * @param {string=} format Formatting rules (see Description). If not specified,
@@ -395,11 +395,7 @@ function dateFilter($locale) {
     format = format || 'mediumDate';
     format = $locale.DATETIME_FORMATS[format] || format;
     if (isString(date)) {
-      if (NUMBER_STRING.test(date)) {
-        date = int(date);
-      } else {
-        date = jsonStringToDate(date);
-      }
+      date = NUMBER_STRING.test(date) ? int(date) : jsonStringToDate(date);
     }
 
     if (isNumber(date)) {

src/ng/filter/orderBy.js

@@ -72,7 +72,7 @@
  * @example
   <example module="orderByExample">
     <file name="index.html">
-      <div ng-controller="Ctrl">
+      <div ng-controller="ExampleController">
         <table class="friend">
           <tr>
             <th><a href="" ng-click="reverse=false;order('name', false)">Name</a>
@@ -153,6 +153,10 @@ function orderByFilter($parse){
       var t1 = typeof v1;
       var t2 = typeof v2;
       if (t1 == t2) {
+        if (isDate(v1) && isDate(v2)) {
+          v1 = v1.valueOf();
+          v2 = v2.valueOf();
+        }
         if (t1 == "string") {
            v1 = v1.toLowerCase();
            v2 = v2.toLowerCase();