docs(changelog): add changes for 1.6.9

This was originally done on the master branch in
commit 03043839d5,
but never back-ported to 1.6.x.

That wasn't a big deal because docs.angularjs.org
served the master snapshot docs. However, now we
serve the 1.6.x snapshot docs, and it looks strange
that the official docs have the wrong branding :).

.editorconfig

@@ -1,4 +1,4 @@
-# https://editorconfig.org
+# http://editorconfig.org
 
 root = true
 

.eslintignore

@@ -1,4 +1,5 @@
 build/**
+docs/bower_components/**
 docs/app/assets/js/angular-bootstrap/**
 docs/config/templates/**
 node_modules/**

.eslintrc-node.json

@@ -1,13 +1,8 @@
 {
   "extends": "./.eslintrc-base.json",
+
   "env": {
     "browser": false,
     "node": true
-  },
-  "parserOptions": {
-    "ecmaVersion": 2017
-  },
-  "plugins": [
-    "promise"
-  ]
+  }
 }

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- General PR submission guidelines https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#submit-pr -->
+<!-- General PR submission guidelines https://github.com/angular/angular.js/CONTRIBUTING.md#submit-pr -->
 **What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)**
 
 
@@ -16,8 +16,8 @@
 
 
 **Please check if the PR fulfills these requirements**
-- [ ] The commit message follows our [guidelines](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#commits)
-- [ ] Fix/Feature: [Docs](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#documentation) have been added/updated
+- [ ] The commit message follows our [guidelines](../DEVELOPERS.md#commits)
+- [ ] Fix/Feature: [Docs](../DEVELOPERS.md#documentation) have been added/updated
 - [ ] Fix/Feature: Tests have been added; existing tests pass
 
 **Other information**:

.gitignore

@@ -1,5 +1,4 @@
 /build/
-/deploy/
 /benchpress-build/
 .DS_Store
 gen_docs.disable

.travis.yml

@@ -32,6 +32,7 @@ before_install:
 before_script:
   - du -sh ./node_modules || true
   - "./scripts/travis/before_build.sh"
+
 script:
   - "./scripts/travis/build.sh"
 
@@ -94,7 +95,7 @@ jobs:
           secret_access_key:
             secure: tHIFdSq55qkyZf9zT/3+VkhUrTvOTMuswxXU3KyWaBrSieZqG0UnUDyNm+n3lSfX95zEl/+rJAWbfvhVSxZi13ndOtvRF+MdI1cvow2JynP0aDSiPffEvVrZOmihD6mt2SlMfhskr5FTduQ69kZG6DfLcve1PPDaIwnbOv3phb8=
           bucket: code-angularjs-org-338b8.appspot.com
-          local-dir: deploy/code
+          local-dir: uploadCode
           detect_encoding: true # detects gzip compression
           on:
             repo: angular/angular.js

CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Contributor Code of Conduct
-
-The AngularJS project follows the Code of Conduct defined in [the angular/code-of-conduct repository](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md). Please read it.

CONTRIBUTING.md

@@ -49,6 +49,7 @@ If you find a bug in the source code, you can help us by submitting an issue to
 **Special Note for Localization Issues:** AngularJS uses the [Google Closure I18N library] to
 generate its own I18N files (the ngLocale module). This means that any changes to these files
 would be lost the next time that we import the library.
+
 Since the Closure library i18n data is itself auto-generated from the data of the
 [Common Locale Data Repository (CLDR)] project, errors in the data should
 be reported there. See also the [Closure guide to i18n changes].
@@ -164,7 +165,6 @@ restarted.
   * Re-run the AngularJS test suite to ensure tests are still passing.
   * Commit your changes to your branch (e.g. `my-fix-branch`).
   * Push the changes to your GitHub repository (this will update your Pull Request).
-
     You can also amend the initial commits and force push them to the branch.
 
     ```shell

Gruntfile.js

@@ -13,8 +13,6 @@ var semver = require('semver');
 var exec = require('shelljs').exec;
 var pkg = require(__dirname + '/package.json');
 
-var docsScriptFolder = 'scripts/docs.angularjs.org-firebase';
-
 // Node.js version checks
 if (!semver.satisfies(process.version, pkg.engines.node)) {
   reportOrFail('Invalid node version (' + process.version + '). ' +
@@ -164,12 +162,7 @@ module.exports = function(grunt) {
 
     clean: {
       build: ['build'],
-      tmp: ['tmp'],
-      deploy: [
-        'deploy/docs',
-        'deploy/code',
-        docsScriptFolder + '/functions/html'
-      ]
+      tmp: ['tmp']
     },
 
     eslint: {
@@ -180,11 +173,11 @@ module.exports = function(grunt) {
           'docs/**/*.js',
           'lib/**/*.js',
           'scripts/**/*.js',
-          '!scripts/*/*/node_modules/**',
           'src/**/*.js',
           'test/**/*.js',
           'i18n/**/*.js',
           '!docs/app/assets/js/angular-bootstrap/**',
+          '!docs/bower_components/**',
           '!docs/config/templates/**',
           '!src/angular.bind.js',
           '!i18n/closure/**',
@@ -194,6 +187,16 @@ module.exports = function(grunt) {
     },
 
     build: {
+      scenario: {
+        dest: 'build/angular-scenario.js',
+        src: [
+          'bower_components/jquery/dist/jquery.js',
+          util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular')
+        ],
+        styles: {
+          css: ['css/angular.css', 'css/angular-scenario.css']
+        }
+      },
       angular: {
         dest: 'build/angular.js',
         src: util.wrap([files['angularSrc']], 'angular'),
@@ -279,7 +282,9 @@ module.exports = function(grunt) {
       files: [
         'src/**/*.js',
         'test/**/*.js',
+        '!test/ngScenario/DescribeSpec.js',
         '!src/ng/directive/attrs.js', // legitimate xit here
+        '!src/ngScenario/**/*.js',
         '!test/helpers/privateMocks*.js'
       ],
       options: {
@@ -321,12 +326,12 @@ module.exports = function(grunt) {
       },
       deployFirebaseCode: {
         files: [
-          // copy files that are not handled by compress
+          // the zip file should not be compressed again.
           {
-            cwd: 'build',
-            src: '**/*.{zip,jpg,jpeg,png}',
-            dest: 'deploy/code/' + deployVersion + '/',
-            expand: true
+            src: 'build/*.zip',
+            dest: 'uploadCode/' + deployVersion + '/',
+            expand: true,
+            flatten: true
           }
         ]
       },
@@ -334,29 +339,15 @@ module.exports = function(grunt) {
         files: [
           // The source files are needed by the embedded examples in the docs app.
           {
-            src: ['build/angular*.{js,js.map,min.js}', 'build/sitemap.xml'],
-            dest: 'deploy/docs/',
+            src: 'build/angular*.{js,js.map,min.js}',
+            dest: 'uploadDocs/',
             expand: true,
             flatten: true
           },
           {
             cwd: 'build/docs',
-            src: ['**', '!ptore2e/**', '!index*.html'],
-            dest: 'deploy/docs/',
-            expand: true
-          },
-          {
-            src: 'build/docs/index-production.html',
-            dest: 'deploy/docs/index.html'
-          },
-          {
-            src: 'build/docs/index-production.html',
-            dest: docsScriptFolder + '/functions/content/index.html'
-          },
-          {
-            cwd: 'build/docs',
-            src: 'partials/**',
-            dest: docsScriptFolder + '/functions/content',
+            src: '**',
+            dest: 'uploadDocs/',
             expand: true
           }
         ]
@@ -377,15 +368,18 @@ module.exports = function(grunt) {
         options: {
           mode: 'gzip'
         },
-        // Already compressed files should not be compressed again
-        src: ['**', '!**/*.{zip,png,jpeg,jpg}'],
+        src: ['**', '!*.zip'],
         cwd: 'build',
         expand: true,
-        dest: 'deploy/code/' + deployVersion + '/'
+        dest: 'uploadCode/' + deployVersion + '/'
       }
     },
 
     shell: {
+      // Travis expects the firebase.json in the repository root, but we have it in a sub-folder
+      'symlink-firebase-docs': {
+        command: 'ln -s ./scripts/docs.angularjs.org-firebase/firebase.json ./firebase.json'
+      },
       'install-node-dependencies': {
         command: 'yarn'
       },
@@ -481,7 +475,7 @@ module.exports = function(grunt) {
     'merge-conflict',
     'eslint'
   ]);
-  grunt.registerTask('prepareDeploy', [
+  grunt.registerTask('prepareFirebaseDeploy', [
     'package',
     'compress:deployFirebaseCode',
     'copy:deployFirebaseCode',

README.md

@@ -12,14 +12,6 @@ It also helps with server-side communication, taming async callbacks with promis
 and it makes client-side navigation and deep linking with hashbang urls or HTML5 pushState a
 piece of cake. Best of all? It makes development fun!
 
---------------------
-
-##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018: [Find out more](https://docs.angularjs.org/misc/version-support-status)
-
-##### Looking for the new Angular? Go here: https://github.com/angular/angular
-
---------------------
-
 * Web site: https://angularjs.org
 * Tutorial: https://docs.angularjs.org/tutorial
 * API Docs: https://docs.angularjs.org/api
@@ -28,6 +20,7 @@ piece of cake. Best of all? It makes development fun!
 * Core Development: [DEVELOPERS.md](DEVELOPERS.md)
 * Dashboard: https://dashboard.angularjs.org
 
+##### Looking for the new Angular? Go here: https://github.com/angular/angular
 
 Documentation
 --------------------

angularFiles.js

@@ -74,7 +74,6 @@ var angularFiles = {
     'src/ng/directive/ngNonBindable.js',
     'src/ng/directive/ngOptions.js',
     'src/ng/directive/ngPluralize.js',
-    'src/ng/directive/ngRef.js',
     'src/ng/directive/ngRepeat.js',
     'src/ng/directive/ngShowHide.js',
     'src/ng/directive/ngStyle.js',
@@ -110,6 +109,7 @@ var angularFiles = {
     ],
     'ngCookies': [
       'src/ngCookies/cookies.js',
+      'src/ngCookies/cookieStore.js',
       'src/ngCookies/cookieWriter.js'
     ],
     'ngMessageFormat': [
@@ -146,6 +146,7 @@ var angularFiles = {
     'ngTouch': [
       'src/ngTouch/touch.js',
       'src/ngTouch/swipe.js',
+      'src/ngTouch/directive/ngClick.js',
       'src/ngTouch/directive/ngSwipe.js'
     ],
     'ngAria': [
@@ -153,8 +154,26 @@ var angularFiles = {
     ]
   },
 
+  'angularScenario': [
+    'src/ngScenario/Scenario.js',
+    'src/ngScenario/Application.js',
+    'src/ngScenario/Describe.js',
+    'src/ngScenario/Future.js',
+    'src/ngScenario/ObjectModel.js',
+    'src/ngScenario/Runner.js',
+    'src/ngScenario/SpecRunner.js',
+    'src/ngScenario/dsl.js',
+    'src/ngScenario/matchers.js',
+    'src/ngScenario/output/Html.js',
+    'src/ngScenario/output/Json.js',
+    'src/ngScenario/output/Xml.js',
+    'src/ngScenario/output/Object.js'
+  ],
+
   'angularTest': [
     'test/helpers/*.js',
+    'test/ngScenario/*.js',
+    'test/ngScenario/output/*.js',
     'test/*.js',
     'test/auto/*.js',
     'test/ng/**/*.js',
@@ -175,15 +194,22 @@ var angularFiles = {
     'test/jquery_remove.js',
     '@angularSrc',
     '@angularSrcModules',
+    '@angularScenario',
     '@angularTest'
   ],
 
   'karmaExclude': [
     'test/jquery_alias.js',
     'src/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js',
     'src/angular.bind.js'
   ],
 
+  'karmaScenario': [
+    'build/angular-scenario.js',
+    'build/docs/docs-scenario.js'
+  ],
+
   'karmaModules': [
     'build/angular.js',
     '@angularSrcModules',
@@ -206,11 +232,13 @@ var angularFiles = {
     'test/jquery_alias.js',
     '@angularSrc',
     '@angularSrcModules',
+    '@angularScenario',
     '@angularTest'
   ],
 
   'karmaJqueryExclude': [
     'src/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js',
     'test/jquery_remove.js',
     'src/angular.bind.js'
   ]

benchmarks/parsed-expressions-bp/app.js

@@ -29,16 +29,19 @@ app.directive('bmPeWatch', function() {
   };
 });
 
-//Executes the specified expression as a collection watcher
-app.directive('bmPeWatchCollection', function() {
+//Executes the specified expression as a watcher
+//Adds a simple wrapper method to allow use of $watch instead of $watchCollection
+app.directive('bmPeWatchLiteral', function($parse) {
+  function retZero() {
+    return 0;
+  }
+
   return {
     restrict: 'A',
     compile: function($element, $attrs) {
-      $element.text($attrs.bmPeWatchCollection);
+      $element.text($attrs.bmPeWatchLiteral);
       return function($scope, $element, $attrs) {
-        $scope.$watchCollection($attrs.bmPeWatchCollection, function(val) {
-          $element.text(val);
-        });
+        $scope.$watch($parse($attrs.bmPeWatchLiteral, retZero));
       };
     }
   };
@@ -69,7 +72,8 @@ app.controller('DataController', function($scope, $rootScope) {
       date2: new Date(Math.random() * Date.now()),
       func: function() { return star; },
       obj: data[i - 1],
-      keys: data[i - 1] && (data[i - 1].keys || Object.keys(data[i - 1]))
+      keys: data[i - 1] && (data[i - 1].keys || Object.keys(data[i - 1])),
+      constructor: data[i - 1]
     });
   }
 

benchmarks/parsed-expressions-bp/main.html

@@ -16,6 +16,12 @@
           <label for="complexPath">Complex Paths</label>
         </li>
 
+        <li>
+          <input type="radio" ng-model="expressionType" value="constructorPath" id="constructorPath">
+          <label for="constructorPath">Constructor Paths</label>
+          ($parse special cases "constructor" for security)
+        </li>
+
         <li>
           <input type="radio" ng-model="expressionType" value="fieldAccess" id="fieldAccess">
           <label for="fieldAccess">Field Accessors</label>
@@ -60,16 +66,6 @@
           <input type="radio" ng-model="expressionType" value="arrayLiterals" id="arrayLiterals">
           <label for="arrayLiterals">Array Literals</label>
         </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="watchCollection" id="watchCollection">
-          <label for="watchCollection">$watchCollection</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="watchCollectionLiterals" id="watchCollectionLiterals">
-          <label for="watchCollectionLiterals">$watchCollection Literals</label>
-        </li>
       </ul>
 
       <!--
@@ -92,6 +88,17 @@
           <span bm-pe-watch="row.keys"></span>
         </li>
 
+        <li ng-switch-when="constructorPath" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="row.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
+        </li>
+
         <li ng-switch-when="complexPath" ng-repeat="(rowIdx, row) in ::data">
           <span bm-pe-watch="row.index"></span>
           <span bm-pe-watch="row.num0"></span>
@@ -208,44 +215,27 @@
         </li>
 
         <li ng-switch-when="objectLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="{foo: rowIdx}"></span>
-          <span bm-pe-watch="{foo: row, bar: rowIdx}"></span>
-          <span bm-pe-watch="{0: row, 1: rowIdx, 2: 3}"></span>
-          <span bm-pe-watch="{str: 'foo', num: rowIdx, b: true}"></span>
-          <span bm-pe-watch="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
-          <span bm-pe-watch="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
+          <span bm-pe-watch-literal="{foo: rowIdx}"></span>
+          <span bm-pe-watch-literal="{foo: row, bar: rowIdx}"></span>
+          <span bm-pe-watch-literal="{0: row, 1: rowIdx, 2: 3}"></span>
+          <span bm-pe-watch-literal="{str: 'foo', num: rowIdx, b: true}"></span>
+          <span bm-pe-watch-literal="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
+          <span bm-pe-watch-literal="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
         </li>
 
         <li ng-switch-when="arrayLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="[rowIdx]"></span>
-          <span bm-pe-watch="[rowIdx, 0]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1, 2]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1, 2, 3]"></span>
-          <span bm-pe-watch="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
-          <span bm-pe-watch="[rowIdx, undefined, null, true, false]"></span>
-          <span bm-pe-watch="[[][0], [0][0], [][rowIdx]]"></span>
-          <span bm-pe-watch="[0, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, 2, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, 2, 3, rowIdx]"></span>
-        </li>
-
-        <li ng-switch-when="watchCollection" ng-repeat="(rowIdx, row) in data">
-          <span bm-pe-watch-collection="data"></span>
-          <span bm-pe-watch-collection="row.keys"></span>
-          <span bm-pe-watch-collection="thisProbablyDoesntHaveAValue"></span>
-        </li>
-
-        <li ng-switch-when="watchCollectionLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch-collection="[rowIdx, row]"></span>
-          <span bm-pe-watch-collection="[rowIdx, row, num0, str0, date0, obj, g, h, i, j, k, l, m, n, o, p]"></span>
-          <span bm-pe-watch-collection="{a: rowIdx, b: row, c: num0, d: str0, e: date0, f: obj, g: g, h: h, i: i, j: j, k: k, l: l, m: m, n: n, o: o, p: p}"></span>
-
-          <!-- primitive/valueOf-compatible -->
-          <span bm-pe-watch-collection="[rowIdx, row]"></span>
-          <span bm-pe-watch-collection="[rowIdx, num0, str0, date0, date1, h, i, j, k, l, m, n, o, p]"></span>
-          <span bm-pe-watch-collection="{a: rowIdx, c: num0, d: str0, e: date0, g: date1, h: h, i: i, j: j, k: k, l: l, m: m, n: n, o: o, p: p}"></span>
+          <span bm-pe-watch-literal="[rowIdx]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2, 3]"></span>
+          <span bm-pe-watch-literal="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
+          <span bm-pe-watch-literal="[rowIdx, undefined, null, true, false]"></span>
+          <span bm-pe-watch-literal="[[][0], [0][0], [][rowIdx]]"></span>
+          <span bm-pe-watch-literal="[0, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, 3, rowIdx]"></span>
         </li>
       </ul>
     </div>

css/angular-scenario.css

@@ -13,8 +13,7 @@ body {
   text-align: center;
 }
 
-#json,
-#xml {
+#json, #xml {
   display: none;
 }
 

css/angular.css

@@ -1,11 +1,7 @@
 @charset "UTF-8";
 
-[ng\:cloak],
-[ng-cloak],
-[data-ng-cloak],
-[x-ng-cloak],
-.ng-cloak,
-.x-ng-cloak,
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
+.ng-cloak, .x-ng-cloak,
 .ng-hide:not(.ng-hide-animate) {
   display: none !important;
 }

docs/app/assets/css/docs.css

@@ -713,14 +713,14 @@ ul.events > li {
   margin-right: 5px;
 }
 
-@media only screen and (min-width: 768px) {
+@media only screen and (min-width: 769px) {
   [ng-include="partialPath"].ng-hide {
     display: block !important;
     visibility: hidden;
   }
 }
 
-@media only screen and (min-width: 768px) and (max-width: 991px) {
+@media only screen and (min-width: 769px) and (max-width: 991px) {
   .main-body-grid {
     margin-top: 160px;
   }
@@ -729,7 +729,7 @@ ul.events > li {
   }
 }
 
-@media only screen and (max-width: 767px) {
+@media only screen and (max-width : 768px) {
   .picker, .picker select {
     width: auto;
     display: block;
@@ -934,14 +934,6 @@ toc-container > div > toc-tree > ul > li > toc-tree > ul > li toc-tree > ul li {
   font-size: 13px;
 }
 
-.dev-status span {
-  padding: 2px 8px;
-  border-radius: 5px;
-}
-.security span { background-color: orange; }
-.stable span { background-color: green; color: white; }
-.current span { background-color: blue; color: white; }
-
 @media handheld and (max-width:800px), screen and (max-device-width:800px), screen and (max-width:800px) {
   .navbar {
     min-height: auto;

docs/app/assets/robots.txt

@@ -1,4 +0,0 @@
-User-agent: *
-
-# The map files are not required by the app
-Disallow: /*.map$

docs/app/e2e/.eslintrc.json

@@ -9,7 +9,6 @@
   },
 
   "globals": {
-    "angular": false,
     /* testabilityPatch / matchers */
     "inject": false,
     "module": false,

docs/app/e2e/app.scenario.js

@@ -21,9 +21,6 @@ describe('docs.angularjs.org', function() {
         console.log('browser console errors: ' + require('util').inspect(filteredLog));
       }
     });
-
-    browser.ignoreSynchronization = false;
-    browser.clearMockModules();
   });
 
 
@@ -105,66 +102,6 @@ describe('docs.angularjs.org', function() {
       expect(mainHeader.getText()).toEqual('Oops!');
     });
 
-    it('should set "noindex" if the page does not exist', function() {
-      browser.get('build/docs/index-production.html#!/api/does/not/exist');
-      var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-      var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-      expect(robots.isPresent()).toBe(true);
-      expect(googleBot.isPresent()).toBe(true);
-    });
-
-    it('should remove "noindex" if the page exists', function() {
-      browser.get('build/docs/index-production.html#!/api');
-      var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-      var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-      expect(robots.isPresent()).toBe(false);
-      expect(googleBot.isPresent()).toBe(false);
-    });
-
-    describe('template request error', function() {
-      beforeEach(function() {
-        browser.addMockModule('httpMocker', function() {
-          angular.module('httpMocker', ['ngMock'])
-            .run(['$httpBackend', function($httpBackend) {
-              $httpBackend.whenGET('localhost:8000/build/docs/partials/api.html').respond(500, '');
-            }]);
-          });
-      });
-
-      it('should set "noindex" for robots if the request fails', function() {
-        // index-test includes ngMock
-        browser.get('build/docs/index-test.html#!/api');
-        var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-        var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-        expect(robots.isPresent()).toBe(true);
-        expect(googleBot.isPresent()).toBe(true);
-      });
-    });
-
-
-    describe('page bootstrap error', function() {
-      beforeEach(function() {
-        browser.addMockModule('httpMocker', function() {
-          // Require a module that does not exist to break the bootstrapping
-          angular.module('httpMocker', ['doesNotExist']);
-        });
-    });
-
-      it('should have "noindex" for robots if bootstrapping fails', function() {
-        browser.get('build/docs/index.html#!/api').catch(function() {
-          // get() will fail on AngularJS bootstrap, but if we continue here, protractor
-          // will assume the app is ready
-          browser.ignoreSynchronization = true;
-          var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-          var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-          expect(robots.isPresent()).toBe(true);
-          expect(googleBot.isPresent()).toBe(true);
-        });
-      });
-
-
-    });
-
   });
 
 });

docs/app/e2e/table-of-contents.scenario.js

@@ -8,7 +8,7 @@
 describe('table of contents', function() {
 
   it('on provider pages', function() {
-    browser.get('build/docs/index.html#!/api/ng/provider/$controllerProvider');
+    browser.get('build/docs/index.html#!/api/ng/provider/$interpolateProvider');
 
     var toc = element.all(by.css('toc-container > div > toc-tree'));
     toc.getText().then(function(text) {
@@ -19,7 +19,7 @@ describe('table of contents', function() {
     var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
 
     tocFirstLevel.then(function(match) {
-      expect(match.length).toBe(2);
+      expect(match.length).toBe(3);
 
       expect(match[1].all(by.css('li')).count()).toBe(2);
     });

docs/app/src/docs.js

@@ -8,8 +8,6 @@ angular.module('DocsController', ['currentVersionData'])
   function($scope, $rootScope, $location, $window, $cookies,
               NG_PAGES, NG_NAVIGATION, CURRENT_NG_VERSION) {
 
-  var errorPartialPath = 'Error404.html';
-
   $scope.navClass = function(navItem) {
     return {
       active: navItem.href && this.currentPage && this.currentPage.path,
@@ -18,6 +16,8 @@ angular.module('DocsController', ['currentVersionData'])
     };
   };
 
+
+
   $scope.$on('$includeContentLoaded', function() {
     var pagePath = $scope.currentPage ? $scope.currentPage.path : $location.path();
     $window._gaq.push(['_trackPageview', pagePath]);
@@ -26,7 +26,6 @@ angular.module('DocsController', ['currentVersionData'])
 
   $scope.$on('$includeContentError', function() {
     $scope.loading = false;
-    $scope.loadingError = true;
   });
 
   $scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
@@ -36,7 +35,6 @@ angular.module('DocsController', ['currentVersionData'])
     var currentPage = $scope.currentPage = NG_PAGES[path];
 
     $scope.loading = true;
-    $scope.loadingError = false;
 
     if (currentPage) {
       $scope.partialPath = 'partials/' + path + '.html';
@@ -52,22 +50,18 @@ angular.module('DocsController', ['currentVersionData'])
     } else {
       $scope.currentArea = NG_NAVIGATION['api'];
       $scope.breadcrumb = [];
-      $scope.partialPath = errorPartialPath;
+      $scope.partialPath = 'Error404.html';
     }
   });
 
-  $scope.hasError = function() {
-    return $scope.partialPath === errorPartialPath || $scope.loadingError;
-  };
-
   /**********************************
    Initialize
    ***********************************/
 
   $scope.versionNumber = CURRENT_NG_VERSION.full;
   $scope.version = CURRENT_NG_VERSION.full + ' ' + CURRENT_NG_VERSION.codeName;
-  $scope.loading = false;
-  $scope.loadingError = false;
+  $scope.loading = 0;
+
 
   var INDEX_PATH = /^(\/|\/index[^.]*.html)$/;
   if (!$location.path() || INDEX_PATH.test($location.path())) {

docs/config/index.js

@@ -22,7 +22,6 @@ module.exports = new Package('angularjs', [
 .factory(require('./services/deployments/debug'))
 .factory(require('./services/deployments/default'))
 .factory(require('./services/deployments/jquery'))
-.factory(require('./services/deployments/test'))
 .factory(require('./services/deployments/production'))
 
 .factory(require('./inline-tag-defs/type'))
@@ -32,7 +31,6 @@ module.exports = new Package('angularjs', [
 .processor(require('./processors/keywords'))
 .processor(require('./processors/pages-data'))
 .processor(require('./processors/versions-data'))
-.processor(require('./processors/sitemap'))
 
 
 .config(function(dgeni, log, readFilesProcessor, writeFilesProcessor) {
@@ -148,7 +146,6 @@ module.exports = new Package('angularjs', [
 
 .config(function(checkAnchorLinksProcessor) {
   checkAnchorLinksProcessor.base = '/';
-  checkAnchorLinksProcessor.errorOnUnmatchedLinks = true;
   // We are only interested in docs that have an area (i.e. they are pages)
   checkAnchorLinksProcessor.checkDoc = function(doc) { return doc.area; };
 })
@@ -159,14 +156,12 @@ module.exports = new Package('angularjs', [
   generateProtractorTestsProcessor,
   generateExamplesProcessor,
   debugDeployment, defaultDeployment,
-  jqueryDeployment, testDeployment,
-  productionDeployment) {
+  jqueryDeployment, productionDeployment) {
 
   generateIndexPagesProcessor.deployments = [
     debugDeployment,
     defaultDeployment,
     jqueryDeployment,
-    testDeployment,
     productionDeployment
   ];
 

docs/config/processors/error-docs.js

@@ -5,36 +5,18 @@
  * @description
  * Process "error" docType docs and generate errorNamespace docs
  */
-module.exports = function errorDocsProcessor(log, errorNamespaceMap, getMinerrInfo) {
+module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
   return {
     $runAfter: ['tags-extracted'],
     $runBefore: ['extra-docs-added'],
     $process: function(docs) {
 
-      // Get the extracted min errors to compare with the error docs, and report any mismatch
-      var collectedErrors = require('../../../build/errors.json').errors;
-      var flatErrors = [];
-
-      for (var namespace in collectedErrors) {
-        for (var error in collectedErrors[namespace]) {
-          flatErrors.push(namespace + ':' + error);
-        }
-      }
-
       // Create error namespace docs and attach error docs to each
       docs.forEach(function(doc) {
         var parts, namespaceDoc;
 
         if (doc.docType === 'error') {
 
-          var matchingMinErr = flatErrors.indexOf(doc.name);
-
-          if (matchingMinErr === -1) {
-            log.warn('Error doc: ' + doc.name + ' has no matching min error');
-          } else {
-            flatErrors.splice(matchingMinErr, 1);
-          }
-
           // Parse out the error info from the id
           parts = doc.name.split(':');
           doc.namespace = parts[0];
@@ -59,10 +41,6 @@ module.exports = function errorDocsProcessor(log, errorNamespaceMap, getMinerrIn
         }
       });
 
-      flatErrors.forEach(function(value) {
-        log.warn('No error doc exists for min error: ' + value);
-      });
-
       errorNamespaceMap.forEach(function(errorNamespace) {
         docs.push(errorNamespace);
       });

docs/config/processors/sitemap.js

@@ -1,25 +0,0 @@
-'use strict';
-
-var exclusionRegex = /^index|examples\/|ptore2e\//;
-
-module.exports = function createSitemap() {
-  return {
-    $runAfter: ['paths-computed'],
-    $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      docs.push({
-        id: 'sitemap.xml',
-        path: 'sitemap.xml',
-        outputPath: '../sitemap.xml',
-        template: 'sitemap.template.xml',
-        urls: docs.filter(function(doc) {
-          return doc.path &&
-            doc.outputPath &&
-            !exclusionRegex.test(doc.outputPath);
-        }).map(function(doc) {
-          return doc.path;
-        })
-      });
-    }
-  };
-};

docs/config/processors/versions-data.js

@@ -55,6 +55,9 @@ module.exports = function generateVersionDocProcessor(gitData) {
 
         if (missesCurrentVersion) versions.push(currentVersion.version);
 
+        // Get the stable release with the highest version
+        var highestStableRelease = versions.reverse().find(semverIsStable);
+
         versions = versions
             .filter(function(versionStr) {
               return blacklist.indexOf(versionStr) === -1;
@@ -82,9 +85,6 @@ module.exports = function generateVersionDocProcessor(gitData) {
         var latest = sortObject(latestMap, reverse(semver.compare))
             .map(function(version) { return makeOption(version, 'Latest'); });
 
-        // Get the stable release with the highest version
-        var highestStableRelease = versions.find(semverIsStable);
-
         // Generate master and stable snapshots
         var snapshots = [
           makeOption(
@@ -130,15 +130,14 @@ module.exports = function generateVersionDocProcessor(gitData) {
         return Object.keys(obj).map(function(key) { return obj[key]; }).sort(cmp);
       }
 
-      // Adapted from
       // https://github.com/kaelzhang/node-semver-stable/blob/34dd29842409295d49889d45871bec55a992b7f6/index.js#L25
       function semverIsStable(version) {
-        var semverObj = version.version;
+        var semverObj = semver.parse(version);
         return semverObj === null ? false : !semverObj.prerelease.length;
       }
 
       function createSnapshotStableLabel(version) {
-        var label = version.label.replace(/.$/, 'x') + '-snapshot';
+        var label = 'v' + version.replace(/.$/, 'x') + '-snapshot';
 
         return label;
       }

docs/config/services/deployments/test.js

@@ -1,40 +0,0 @@
-'use strict';
-
-module.exports = function testDeployment(getVersion) {
-  return {
-    name: 'test',
-    examples: {
-      commonFiles: {
-        scripts: ['../../../angular.js']
-      },
-      dependencyPath: '../../../'
-    },
-    scripts: [
-      '../angular.js',
-      '../angular-resource.js',
-      '../angular-route.js',
-      '../angular-cookies.js',
-      '../angular-mocks.js',
-      '../angular-sanitize.js',
-      '../angular-touch.js',
-      '../angular-animate.js',
-      'components/marked-' + getVersion('marked') + '/lib/marked.js',
-      'js/angular-bootstrap/dropdown-toggle.js',
-      'components/lunr-' + getVersion('lunr') + '/lunr.js',
-      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
-      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
-      'js/current-version-data.js',
-      'js/all-versions-data.js',
-      'js/pages-data.js',
-      'js/nav-data.js',
-      'js/docs.js'
-    ],
-    stylesheets: [
-      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css',
-      'css/prettify-theme.css',
-      'css/angular-topnav.css',
-      'css/docs.css',
-      'css/animations.css'
-    ]
-  };
-};

docs/config/templates/app/indexPage.template.html

@@ -11,18 +11,6 @@
   <meta name="fragment" content="!">
   <title ng-bind-template="AngularJS: {{ currentArea.name }}: {{ currentPage.name || 'Error: Page not found'}}">AngularJS</title>
 
-  <script type="text/javascript">
-    (function() {
-      // Dynamically, pre-emptively, add `noindex`, which will be removed when the doc is ready and valid
-      ['googlebot', 'robots'].forEach(function(bot) {
-        var tag = document.createElement('meta');
-        tag.name = bot;
-        tag.content = 'noindex';
-        tag.setAttribute('ng-if', 'hasError()');
-        document.head.appendChild(tag);
-      });
-    })();
-  </script>
   <script type="text/javascript">
     // dynamically add base tag as well as css and javascript files.
     // we can't add css/js the usual way, because some browsers (FF) eagerly prefetch resources
@@ -139,7 +127,7 @@
             </ul>
 
           </div>
-          <div class="search-results-container" ng-show="hasResults" ng-cloak>
+          <div class="search-results-container" ng-show="hasResults">
             <div class="container">
               <div class="search-results-frame">
                 <div ng-repeat="(key, value) in results track by key" class="search-results-group" ng-class="colClassName + ' col-group-' + key" ng-show="value.length > 0">
@@ -169,7 +157,7 @@
           </div>
         </div>
       </nav>
-      <nav id="navbar-sub" class="sup-header navbar navbar-fixed-top" scroll-y-offset-element ng-cloak>
+      <nav id="navbar-sub" class="sup-header navbar navbar-fixed-top" scroll-y-offset-element>
         <div class="container main-grid main-header-grid">
           <div class="grid-left">
             <version-picker></version-picker>
@@ -186,7 +174,7 @@
       </nav>
     </header>
 
-    <section role="main" class="container main-body" ng-cloak>
+    <section role="main" class="container main-body">
       <div class="main-grid main-body-grid">
         <div class="grid-left">
           <a class="btn toc-toggle visible-xs" ng-click="toc=!toc">Show / Hide Table of Contents</a>
@@ -210,8 +198,7 @@
           </div>
         </div>
         <div class="grid-right">
-          <div ng-show="loading">Loading &hellip;</div>
-          <div ng-show="loadingError">There was an error loading this resource. Please try again later.</div>
+          <div id="loading" ng-show="loading">Loading...</div>
           <div ng-hide="loading" ng-include="partialPath" toc-collector autoscroll></div>
         </div>
       </div>

docs/config/templates/app/sitemap.template.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  {%- for url in doc.urls %}
-  <url>
-    <loc>https://docs.angularjs.org/{$ url $}</loc>
-  </url>{% endfor %}
-</urlset>

docs/content/api/index.ngdoc

@@ -3,15 +3,7 @@
 @description
 
 # AngularJS API Docs
-
-<div class="alert alert-warning">
-**AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018.**: [Find out more](misc/version-support-status).
-</div>
-
-## Welcome to the AngularJS API docs page.
-
-These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
-
+Welcome to the AngularJS API docs page. These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
 
 The documentation is organized into **{@link guide/module modules}** which contain various components of an AngularJS application.
 These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks.
@@ -222,7 +214,11 @@ Use the ngCookies module to handle cookie management within your application.
       {@link ngCookies#service Services / Factories}
     </td>
     <td>
-      The {@link ngCookies.$cookies $cookies} service is a convenient wrapper to store simple data within browser cookies.
+      The following services are used for cookie management:
+      <ul>
+        <li>The {@link ngCookies.$cookies $cookie} service is a convenient wrapper to store simple data within browser cookies.</li>
+        <li>{@link ngCookies.$cookieStore $cookieStore} is used to store more complex data using serialization.</li>
+      </ul>
     </td>
   </tr>
 </table>

docs/content/error/$compile/iscp.ngdoc

@@ -10,15 +10,13 @@ myModule.directive('directiveName', function factory() {
   return {
     ...
     scope: {
-      'localName': '@', // OK
-      'localName2': '&attr', // OK
-      'localName3': '<?attr', // OK
-      'localName4': ' = attr', // OK
-      'localName5': ' =*attr', // OK      
-      'localName6': 'attr',    // ERROR: missing mode @&=<
-      'localName7': 'attr=',   // ERROR: must be prefixed with @&=<
-      'localName8': '=attr?',  // ERROR: ? must come directly after the mode
-      'localName9': '<*'  // ERROR: * is only valid with =
+      'attrName': '@', // OK
+      'attrName2': '=localName', // OK
+      'attrName3': '<?localName', // OK
+      'attrName4': ' = name', // OK
+      'attrName5': 'name',    // ERROR: missing mode @&=
+      'attrName6': 'name=',   // ERROR: must be prefixed with @&=
+      'attrName7': '=name?',  // ERROR: ? must come directly after the mode
     }
     ...
   }

docs/content/error/$compile/missingattr.ngdoc

@@ -3,34 +3,6 @@
 @fullName Missing required attribute
 @description
 
-This error may occur only when {@link $compileProvider#strictComponentBindingsEnabled `$compileProvider.strictComponentBindingsEnabled`} is set to `true`.
-
-If that is the case, then all {@link $compileProvider#component component} controller bindings and
-{@link $compileProvider#directive directive} scope / controller bindings that are non-optional,
-must be provided when the directive is instantiated.
-
-To make a binding optional, add '?' to the definition.
-
-## Example:
-
-```js
-
-app.component('myTest', {
-  bindings: {
-    first: '=?', // optional
-    second: '='
-  },
-  controller: function() {
-    ...
-  },
-  template: '...'
-});
-
-```
-
-This component will throw `missingattr` for the `second` binding when used as follows:
-
-```html
-<my-test></my-test>
-```
-
+This error may occur only when `$compileProvider.strictComponentBindingsEnabled` is set to `true`.
+Then all attributes mentioned in `bindings` without `?` must be set. If one or more aren't set,
+the first one will throw an error.

docs/content/error/$compile/srcset.ngdoc

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $compile:srcset
-@fullName Invalid value passed to `attr.$set('srcset', value)`
-@description
-
-This error occurs if you try to programmatically set the `srcset` attribute with a non-string value.
-
-This can be the case if you tried to avoid the automatic sanitization of the `srcset` value by
-passing a "trusted" value provided by calls to `$sce.trustAsMediaUrl(value)`.
-
-If you want to programmatically set explicitly trusted unsafe URLs, you should use `$sce.trustAsHtml`
-on the whole `img` tag and inject it into the DOM using the `ng-bind-html` directive.

docs/content/error/$compile/tpload.ngdoc

@@ -0,0 +1,11 @@
+@ngdoc error
+@name $compile:tpload
+@fullName Error Loading Template
+@description
+
+This error occurs when {@link ng.$compile `$compile`} attempts to fetch a template from some URL, and the request fails.
+
+To resolve this error, ensure that the URL of the template is spelled correctly and resolves to correct absolute URL.
+The [Chrome Developer Tools](https://developers.google.com/chrome-developer-tools/docs/network#network_panel_overview) might also be helpful in determining why the request failed.
+
+If you are using {@link ng.$templateCache} to pre-load templates, ensure that the cache was populated with the template.

docs/content/error/$http/badjsonp.ngdoc

@@ -9,7 +9,7 @@ value is `JSON_CALLBACK`.
 
 `$http` JSONP requests need to attach a callback query parameter to the URL. The name of this
 parameter is specified in the configuration object (or in the defaults) via the `jsonpCallbackParam`
-property. You must not provide your own parameter with this name in the configuration of the request.
+property. You must not provide your own parameter with this name in the configuratio of the request.
 
 In previous versions of AngularJS, you specified where to add the callback parameter value via the
 `JSON_CALLBACK` placeholder. This is no longer allowed.

docs/content/error/$interval/badprom.ngdoc

@@ -1,25 +0,0 @@
-@ngdoc error
-@name $interval:badprom
-@fullName Non-$interval promise
-@description
-
-This error occurs when calling {@link ng.$interval#cancel $interval.cancel()} with a promise that
-was not generated by the {@link ng.$interval $interval} service. This can, for example, happen when
-calling {@link ng.$q#the-promise-api then()/catch()} on the returned promise, which creates a new
-promise, and pass that new promise to {@link ng.$interval#cancel $interval.cancel()}.
-
-Example of incorrect usage that leads to this error:
-
-```js
-var promise = $interval(doSomething, 1000, 5).then(doSomethingElse);
-$interval.cancel(promise);
-```
-
-To fix the example above, keep a reference to the promise returned by
-{@link ng.$interval $interval()} and pass that to {@link ng.$interval#cancel $interval.cancel()}:
-
-```js
-var promise = $interval(doSomething, 1000, 5);
-var newPromise = promise.then(doSomethingElse);
-$interval.cancel(promise);
-```

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

@@ -1,10 +0,0 @@
-@ngdoc error
-@name $parse:esc
-@fullName Value cannot be escaped
-@description
-
-Occurs when the parser tries to escape a value that is not known.
-
-This should never occur in practice. If it does then that indicates a programming
-error in the AngularJS `$parse` service itself and should be reported as an issue
-at https://github.com/angular/angular.js/issues.

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

@@ -1,13 +0,0 @@
-@ngdoc error
-@name $parse:lval
-@fullName Trying to assign a value to a non l-value
-@description
-
-Occurs when an expression is trying to assign a value to a non-assignable expression.
-
-This can happen if the left side of an assigment is not a valid reference to a variable
-or property. E.g. In the following snippet `1+2` is not assignable.
-
-```
-(1+2) = 'hello';
-```

docs/content/error/$route/norout.ngdoc

@@ -1,8 +0,0 @@
-@ngdoc error
-@name $route:norout
-@fullName Tried updating route with no current route
-@description
-
-Occurs when an attempt is made to update the parameters on the current route when
-there is no current route. This can happen if you try to call `$route.updateParams();`
-before the first route transition has completed.

docs/content/error/$templateRequest/tpload.ngdoc

@@ -1,18 +0,0 @@
-@ngdoc error
-@name $templateRequest:tpload
-@fullName Error Loading Template
-@description
-
-This error occurs when {@link $templateRequest} attempts to fetch a template from some URL, and
-the request fails.
-
-The template URL might be defined in a directive/component definition, an instance of `ngInclude`,
-an instance of `ngMessagesInclude` or a templated route in a `$route` route definition.
-
-To resolve this error, ensure that the URL of the template is spelled correctly and resolves to
-correct absolute URL.
-The [Chrome Developer Tools](https://developers.google.com/chrome-developer-tools/docs/network#network_panel_overview)
-might also be helpful in determining why the request failed.
-
-If you are using {@link ng.$templateCache} to pre-load templates, ensure that the cache was
-populated with the template.

docs/content/error/$timeout/badprom.ngdoc

@@ -1,25 +0,0 @@
-@ngdoc error
-@name $timeout:badprom
-@fullName Non-$timeout promise
-@description
-
-This error occurs when calling {@link ng.$timeout#cancel $timeout.cancel()} with a promise that
-was not generated by the {@link ng.$timeout $timeout} service. This can, for example, happen when
-calling {@link ng.$q#the-promise-api then()/catch()} on the returned promise, which creates a new
-promise, and pass that new promise to {@link ng.$timeout#cancel $timeout.cancel()}.
-
-Example of incorrect usage that leads to this error:
-
-```js
-var promise = $timeout(doSomething, 1000).then(doSomethingElse);
-$timeout.cancel(promise);
-```
-
-To fix the example above, keep a reference to the promise returned by
-{@link ng.$timeout $timeout()} and pass that to {@link ng.$timeout#cancel $timeout.cancel()}:
-
-```js
-var promise = $timeout(doSomething, 1000);
-var newPromise = promise.then(doSomethingElse);
-$timeout.cancel(promise);
-```

docs/content/error/jqLite/nosel.ngdoc

@@ -3,9 +3,12 @@
 @fullName Unsupported Selector Lookup
 @description
 
-In order to keep AngularJS small, AngularJS implements only a subset of the selectors in {@link angular.element#angularjs-s-jqlite jqLite}.
+In order to keep AngularJS small, AngularJS implements only a subset of the selectors in
+{@link angular.element#angularjs-s-jqlite jqLite}.
 This error occurs when a jqLite instance is invoked with a selector other than this subset.
 
-In order to resolve this error, rewrite your code to only use tag name selectors and manually traverse the DOM using the APIs provided by jqLite.
+In order to resolve this error, rewrite your code to only use tag name selectors and manually
+traverse the DOM using the APIs provided by jqLite.
 
-Alternatively, you can include a full version of jQuery, which AngularJS will automatically use and that will make all selectors available.
+Alternatively, you can include a full version of jQuery, which AngularJS will automatically use
+and that will make all selectors available.

docs/content/error/ngRef/noctrl.ngdoc

@@ -1,17 +0,0 @@
-@ngdoc error
-@name ngRef:noctrl
-@fullName A controller for the value of `ngRefRead` could not be found on the element.
-@description
-
-This error occurs when the {@link ng.ngRef ngRef directive} specifies
-a value in `ngRefRead` that cannot be resolved to a directive / component controller.
-
-Causes for this error can be:
-
-1. Your `ngRefRead` value has a typo.
-2. You have a typo in the *registered* directive / component name.
-3. The directive / component does not have a controller.
-
-Note that `ngRefRead` takes the name of the component / directive, not the name of controller, and
-also not the combination of directive and 'Controller'. For example, for a directive called 'myDirective',
-the correct declaration is `<div ng-ref="$ctrl.ref" ng-ref-read="myDirective">`.

docs/content/error/ngRef/nonassign.ngdoc

@@ -1,27 +0,0 @@
-@ngdoc error
-@name ngRef:nonassign
-@fullName Non-Assignable Expression
-@description
-
-This error occurs when ngRef defines an expression that is not-assignable.
-
-In order for ngRef to work, it must be possible to write the reference into the path defined with the expression.
-
-For example, the following expressions are non-assignable:
-
-```
-<my-directive ng-ref="{}"></my-directive>
-
-<my-directive ng-ref="myFn()"></my-directive>
-
-<!-- missing attribute value is also invalid -->
-<my-directive ng-ref></my-directive>
-
-```
-
-To resolve this error, use a path expression that is assignable:
-
-```
-<my-directive ng-ref="$ctrl.reference"></my-directive>
-
-```

docs/content/guide/animations.ngdoc

@@ -222,26 +222,22 @@ triggered:
 
 | Directive                                                                     | Supported Animations                                                      |
 |-------------------------------------------------------------------------------|---------------------------------------------------------------------------|
-| {@link ng.directive:form#animations form / ngForm}                            | add and remove ({@link ng.directive:form#css-classes various classes})    |
-| {@link ngAnimate.directive:ngAnimateSwap#animations ngAnimateSwap}            | enter and leave                                                           |
-| {@link ng.directive:ngClass#animations ngClass / {{class}​}}  | add and remove                                                            |
-| {@link ng.directive:ngClassEven#animations ngClassEven}                       | add and remove                                                            |
-| {@link ng.directive:ngClassOdd#animations ngClassOdd}                         | add and remove                                                            |
-| {@link ng.directive:ngHide#animations ngHide}                                 | add and remove (the `ng-hide` class)                                      |
-| {@link ng.directive:ngIf#animations ngIf}                                     | enter and leave                                                           |
-| {@link ng.directive:ngInclude#animations ngInclude}                           | enter and leave                                                           |
-| {@link module:ngMessages#animations ngMessage / ngMessageExp}                 | enter and leave                                                           |
-| {@link module:ngMessages#animations ngMessages}                               | add and remove (the `ng-active`/`ng-inactive` classes)                    |
-| {@link ng.directive:ngModel#animations ngModel}                               | add and remove ({@link ng.directive:ngModel#css-classes various classes}) |
 | {@link ng.directive:ngRepeat#animations ngRepeat}                             | enter, leave, and move                                                    |
-| {@link ng.directive:ngShow#animations ngShow}                                 | add and remove (the `ng-hide` class)                                      |
+| {@link ng.directive:ngIf#animations ngIf}                                     | enter and leave                                                           |
 | {@link ng.directive:ngSwitch#animations ngSwitch}                             | enter and leave                                                           |
+| {@link ng.directive:ngInclude#animations ngInclude}                           | enter and leave                                                           |
 | {@link ngRoute.directive:ngView#animations ngView}                            | enter and leave                                                           |
-
-(More information can be found by visiting the documentation associated with each directive.)
+| {@link module:ngMessages#animations ngMessage / ngMessageExp}                 | enter and leave                                                           |
+| {@link ng.directive:ngClass#animations ngClass / {{class}​}}  | add and remove                                                            |
+| {@link ng.directive:ngClass#animations ngClassEven / ngClassOdd}              | add and remove                                                            |
+| {@link ng.directive:ngHide#animations ngHide}                                 | add and remove (the `ng-hide` class)                                      |
+| {@link ng.directive:ngShow#animations ngShow}                                 | add and remove (the `ng-hide` class)                                      |
+| {@link ng.directive:ngModel#animations ngModel}                          | add and remove ({@link ng.directive:ngModel#css-classes various classes}) |
+| {@link ng.directive:form#animations form / ngForm}                       | add and remove ({@link ng.directive:form#css-classes various classes})    |
+| {@link module:ngMessages#animations ngMessages}                               | add and remove (the `ng-active`/`ng-inactive` classes)                    |
 
 For a full breakdown of the steps involved during each animation event, refer to the
-{@link ng.$animate `$animate` API docs}.
+{@link ng.$animate API docs}.
 
 ## How do I use animations in my own directives?
 
@@ -471,7 +467,7 @@ You can also use one of the other
 strategies to disable animations}.
 
 
-## Enable animations outside of the application DOM tree: {@link ng.$animate#pin $animate.pin()}
+### Enable animations for elements outside of the AngularJS application DOM tree: {@link ng.$animate#pin $animate.pin()}
 
 Before animating, `ngAnimate` checks if the animated element is inside the application DOM tree. If
 not, no animation is run. Usually, this is not a problem since most apps use the `html` or `body`

docs/content/guide/component-router.ngdoc

@@ -14,7 +14,6 @@ This guide describes the Component Router for AngularJS.
 
 <div class="alert alert-info">
   If you are looking for information about the default router for AngularJS have a look at the {@link ngRoute} module.
-
   If you are looking for information about the Component Router for the new Angular then
   check out the [Angular Router Guide](https://angular.io/docs/ts/latest/guide/router.html).
 </div>

docs/content/guide/component.ngdoc

@@ -25,7 +25,7 @@ When not to use Components:
 
 ## Creating and configuring a Component
 
-Components can be registered using the {@link ng.$compileProvider#component `.component()`} method of an AngularJS module (returned by {@link module `angular.module()`}). The method takes two arguments:
+Components can be registered using the `.component()` method of an AngularJS module (returned by {@link module `angular.module()`}). The method takes two arguments:
 
   * The name of the Component (as string).
   * The Component config object. (Note that, unlike the `.directive()` method, this method does **not** take a factory function.)

docs/content/guide/controller.ngdoc

@@ -116,6 +116,7 @@ objects (or primitives) assigned to the scope become model properties. Any metho
 the scope are available in the template/view, and can be invoked via AngularJS expressions
 and `ng` event handler directives (e.g. {@link ng.directive:ngClick ngClick}).
 
+
 ## Simple Spicy Controller Example
 
 To illustrate further how Controller components work in AngularJS, let's create a little app with the
@@ -156,7 +157,7 @@ string "very". Depending on which button is clicked, the `spice` model is set to
 
 Things to notice in the example above:
 
-- The `ng-controller` directive is used to (implicitly) create a scope for our template, and the
+- The `ngController` directive is used to (implicitly) create a scope for our template, and the
 scope is augmented (managed) by the `SpicyController` Controller.
 - `SpicyController` is just a plain JavaScript function. As an (optional) naming convention the name
 starts with capital letter and ends with "Controller".

docs/content/guide/directive.ngdoc

@@ -125,8 +125,8 @@ and comments (M).
 
 The built-in AngularJS directives show in their documentation page which type of matching they support.
 
-The following demonstrates the various ways a directive (`myDir` in this case) that matches all
-4 types can be referenced from within a template.
+The following demonstrates the various ways a directive that matches all 4 types
+(`myDir` in this case) can be referenced from within a template.
 
 ```html
 <my-dir></my-dir>

docs/content/guide/e2e-testing.ngdoc

@@ -5,6 +5,12 @@
 
 # E2E Testing
 
+<div class="alert alert-danger">
+**Note:** In the past, end-to-end testing could be done with a deprecated tool called
+[AngularJS Scenario Runner](http://code.angularjs.org/1.2.16/docs/guide/e2e-testing). That tool
+is now in maintenance mode, and will be removed in version 1.7.0.
+</div>
+
 As applications grow in size and complexity, it becomes unrealistic to rely on manual testing to
 verify the correctness of new features, catch bugs and notice regressions. Unit tests
 are the first line of defense for catching bugs, but sometimes issues come up with integration

docs/content/guide/expression.ngdoc

@@ -37,8 +37,8 @@ AngularJS expressions are like JavaScript expressions with the following differe
     even inside `ng-init` directive.
 
   * **No RegExp Creation With Literal Notation:** You cannot create regular expressions
-    in an AngularJS expression. An exception to this rule is {@link ngPattern `ng-pattern`} which accepts valid
-    RegExp.
+    in an AngularJS expression. An exception to this rule is {@link ngPattern `ng-pattern`} which
+    accepts valid RegExp.
 
   * **No Object Creation With New Operator:** You cannot use `new` operator in an AngularJS expression.
 

docs/content/guide/ie.ngdoc

@@ -39,12 +39,3 @@ To ensure your AngularJS application works on IE please consider:
    of `placeholder="{{ someExpression }}"`. If using the latter, Internet Explorer will error
    on accessing the `nodeValue` on a parentless `TextNode` in Internet Explorer 10 & 11
    (see [issue 5025](https://github.com/angular/angular.js/issues/5025)).
-5. Using the `disabled` attribute on an element that has
-   descendant form controls can result in unexpected behavior in Internet Explorer 11.
-   For example, the value of descendant input elements with `ng-model` will not reflect
-   the model (or changes to the model), and the value of the `placeholder` attribute will be
-   inserted as the input's value. Descendant select elements will also be inoperable, as if they
-   had the `disabled` attribute applied to them, which may not be the intended effect.
-   To work around this unexpected behavior, 1) avoid using the identifier `disabled` for custom attribute
-   directives that are on elements with descendant form controls, and 2) avoid using `disabled` as an identifier
-   for an attribute passed to a custom directive that has descendant form controls.

docs/content/guide/index.ngdoc

@@ -75,7 +75,7 @@ Official announcements, news and releases are posted to our blog, G+ and Twitter
 
 * [AngularJS Blog](http://blog.angularjs.org/)
 * [Google+](https://plus.google.com/u/0/+AngularJS)
-* [Twitter](https://twitter.com/angular)
+* [Twitter](https://twitter.com/angularjs)
 * [AngularJS on YouTube](http://youtube.com/angularjs)
 
 ## Contributing to AngularJS

docs/content/guide/migration.ngdoc

@@ -15,764 +15,6 @@ which drives many of these changes.
 * Several new features, especially animations, would not be possible without a few changes.
 * Finally, some outstanding bugs were best fixed by changing an existing API.
 
-
-## Migrating from 1.6 to 1.7
-
-AngularJS 1.7 contains bug fixes and features to AngularJS core and its external modules, some of
-which contain breaking changes. However, most of these address internal behavior and not APIs, and
-should not affect many applications.
-Additionally, we have removed some long-deprecated modules and APIs.
-
-The most notable changes are:
-
-- $resource has now support for request and requestError interceptors
-
-- Several deprecated features have been removed:
-    - the `$controllerProvider.allowGlobals()` flag
-    - the `$compileProvider.preAssignBindingsEnabled()` flag
-    - the `angular.lowercase` and `angular.uppercase` methods
-    - the `$cookieStore` service from the `ngCookies` module
-    - the `ngClick` override directive and corresponding services from the `ngTouch` module
-    - the complete `ngScenario` module
-
-Please note that feature development (without breaking changes) has happened in parallel on the
-1.6.x branch, so 1.7 doesn't contain many new features, but you may still benefit from those features
-that were added (with possible BCs), bugfixes, and a few smaller performance improvements.
-
-
-<br />
-Below is the full list of breaking changes:
-
-
-<br />
-<a name="migrate1.6to1.7-ng-directives"></a>
-### Core: _Directives_
-
-<a name="migrate1.6to1.7-ng-directives-form"></a>
-
-#### **form**
-**Due to [223de5](https://github.com/angular/angular.js/commit/223de59e988dc0cc8b4ec3a045b7c0735eba1c77)**,
-forms will now set $submitted on child forms when they are submitted.
-For example:
-```
-<form name="parentform" ng-submit="$ctrl.submit()">
-  <ng-form name="childform">
-    <input type="text" name="input" ng-model="my.model" />
-  </ng-form>
-  <input type="submit" />
-</form>
-```
-
-Submitting this form will set $submitted on "parentform" and "childform".
-Previously, it was only set on "parentform".
-
-This change was introduced because mixing form and ngForm does not create
-logically separate forms, but rather something like input groups.
-Therefore, child forms should inherit the submission state from their parent form.
-
-
-#### **input[radio]** and **input[checkbox]**
-**Due to [656c8f](https://github.com/angular/angular.js/commit/656c8fa8f23b1277cc5c214c4d0237f3393afa1e)**,
-`input[radio]` and `input[checkbox]` now listen to the "change" event instead of the "click" event.
-Most apps should not be affected, as "change" is automatically fired by browsers after "click"
-happens.
-
-Two scenarios might need migration:
-
-- Custom click events:
-
-Before this change, custom click event listeners on radio / checkbox would be called after the
-input element and `ngModel` had been updated, unless they were specifically registered before
-the built-in click handlers.
-After this change, they are called before the input is updated, and can call event.preventDefault()
-to prevent the input from updating.
-
-If an app uses a click event listener that expects ngModel to be updated when it is called, it now
-needs to register a change event listener instead.
-
-- Triggering click events:
-
-Conventional trigger functions:
-
-The change event might not be fired when the input element is not attached to the document. This
-can happen in **tests** that compile input elements and
-trigger click events on them. Depending on the browser (Chrome and Safari) and the trigger method,
-the change event will not be fired when the input isn't attached to the document.
-
-Before:
-
-```js
-    it('should update the model', inject(function($compile, $rootScope) {
-      var inputElm = $compile('<input type="checkbox" ng-model="checkbox" />')($rootScope);
-
-      inputElm[0].click(); // Or different trigger mechanisms, such as jQuery.trigger()
-      expect($rootScope.checkbox).toBe(true);
-    });
-```
-
-With this patch, `$rootScope.checkbox` might not be true, because the click event
-hasn't triggered the change event. To make the test, work append the inputElm to the app's
-`$rootElement`, and the `$rootElement` to the `$document`.
-
-After:
-
-```js
-    it('should update the model', inject(function($compile, $rootScope, $rootElement, $document) {
-      var inputElm = $compile('<input type="checkbox" ng-model="checkbox" />')($rootScope);
-
-      $rootElement.append(inputElm);
-      $document.append($rootElement);
-
-      inputElm[0].click(); // Or different trigger mechanisms, such as jQuery.trigger()
-      expect($rootScope.checkbox).toBe(true);
-    });
-```
-
-
-#### **input\[number\]**
-**Due to [aa3f95](https://github.com/angular/angular.js/commit/aa3f951330ec7b10b43ea884d9b5754e296770ec)**,
-`input[type=number]` with `ngModel` now validates the input for the `max`/`min` restriction against
-the `ngModelController.$viewValue` instead of against the `ngModelController.$modelValue`.
-
-This affects apps that use `$parsers` or `$formatters` to transform the input / model value.
-
-If you rely on the $modelValue validation, you can overwrite the `min`/`max` validator from a custom directive, as seen in the following example directive definition object:
-
-```
-{
-  restrict: 'A',
-  require: 'ngModel',
-  link: function(scope, element, attrs, ctrl) {
-    var maxValidator = ctrl.$validators.max;
-
-    ctrk.$validators.max = function(modelValue, viewValue) {
-      return maxValidator(modelValue, modelValue);
-    };
-  }
-}
-```
-
-
-#### **ngModel, input**
-**Due to [74b04c](https://github.com/angular/angular.js/commit/74b04c9403af4fc7df5b6420f22c9f45a3e84140)**,
-*Custom* parsers that fail to parse on input types "email", "url", "number", "date", "month",
-"time", "datetime-local", "week", no longer set `ngModelController.$error[inputType]`, and
-the `ng-invalid-[inputType]` class. Also, custom parsers on input type "range" do no
-longer set `ngModelController.$error.number` and the `ng-invalid-number` class.
-
-Instead, any custom parsers on these inputs set `ngModelController.$error.parse` and
-`ng-invalid-parse`. This change was made to make distinguishing errors from built-in parsers
-and custom parsers easier.
-
-
-#### **ngModelOptions**
-**Due to [55ba44](https://github.com/angular/angular.js/commit/55ba44913e02650b56410aa9ab5eeea5d3492b68)**,
-the 'default' key in 'debounce' now only debounces the default event, i.e. the event that is added
-as an update trigger by the different input directives automatically.
-
-Previously, it also applied to other update triggers defined in 'updateOn' that
-did not have a corresponding key in the 'debounce'.
-
-This behavior is now supported via a special wildcard / catch-all key: '*'.
-
-See the following example:
-
-Pre-1.7:
-'mouseup' is also debounced by 500 milliseconds because 'default' is applied:
-```
-ng-model-options="{
-  updateOn: 'default blur mouseup',
-  debounce: { 'default': 500, 'blur': 0 }
-}
-```
-
-1.7:
-The pre-1.7 behavior can be re-created by setting '*' as a catch-all debounce value:
-```
-ng-model-options="{
-  updateOn: 'default blur mouseup',
-  debounce: { '*': 500, 'blur': 0 }
-}
-```
-
-In contrast, when only 'default' is used, 'blur' and 'mouseup' are not debounced:
-```
-ng-model-options="{
-  updateOn: 'default blur mouseup',
-  debounce: { 'default': 500 }
-}
-```
-
-
-#### **ngStyle**
-
-**Due to [15bbd3](https://github.com/angular/angular.js/commit/15bbd3e18cd89b91f7206a06c73d40e54a8a48a0)**,
-previously the use of deep watch by ng-style would trigger styles to be
-re-applied when nested state changed. Now only changes to direct
-properties of the watched object will trigger changes.
-
-
-<a name="migrate1.6to1.7-ng-services"></a>
-### Core: _Services_
-
-#### **$compile**
-
-**Due to [38f8c9](https://github.com/angular/angular.js/commit/38f8c97af74649ce224b6dd45f433cc665acfbfb)**,
-directive bindings are no longer available in the constructor.
-
-Previously, the `$compileProvider.preAssignBindingsEnabled` flag was supported.
-The flag controlled whether bindings were available inside the controller
-constructor or only in the `$onInit` hook. The bindings are now no longer
-available in the constructor.
-
-To migrate your code:
-
-1. If you haven't invoked `$compileProvider.preAssignBindingsEnabled()` you
-don't have to do anything to migrate.
-
-2. If you specified `$compileProvider.preAssignBindingsEnabled(false)`, you
-can remove that statement - since AngularJS 1.6.0 this is the default so your
-app should still work even in AngularJS 1.6 after such removal. Afterwards,
-migrating to AngularJS 1.7.0 shouldn't require any further action.
-
-3. If you specified `$compileProvider.preAssignBindingsEnabled(true)` you need
-to first migrate your code so that the flag can be flipped to `false`. The
-instructions on how to do that are available in the "Migrating from 1.5 to 1.6"
-guide:
-https://docs.angularjs.org/guide/migration#migrating-from-1-5-to-1-6
-Afterwards, remove the `$compileProvider.preAssignBindingsEnabled(true)`
-statement.
-
-<hr />
-**Due to [6ccbfa](https://github.com/angular/angular.js/commit/6ccbfa65d60a3dc396d0cf6da21b993ad74653fd)**,
-the `xlink:href` security context for SVG's `a` and `image` elements has been lowered.
-
-In the unlikely case that an app relied on RESOURCE_URL whitelisting for the
-purpose of binding to the `xlink:href` property of SVG's `<a>` or `<image>`
-elements and if the values do not pass the regular URL sanitization, they will
-break.
-
-To fix this you need to ensure that the values used for binding to the affected
-`xlink:href` contexts are considered safe URLs, e.g. by whitelisting them in
-`$compileProvider`'s `aHrefSanitizationWhitelist` (for `<a>` elements) or
-`imgSrcSanitizationWhitelist` (for `<image>` elements).
-
-<hr />
-**Due to [fd4f01](https://github.com/angular/angular.js/commit/fd4f0111188b62773b99ab6eab38b4d2b5d8d727)**,
-deepWatch is no longer used in in literal one-way bindings.
-
-Previously when a literal value was passed into a directive/component via
-one-way binding it would be watched with a deep watcher.
-
-For example, for `<my-component input="[a]">`, a new instance of the array
-would be passed into the directive/component (and trigger $onChanges) not
-only if `a` changed but also if any sub property of `a` changed such as
-`a.b` or `a.b.c.d.e` etc.
-
-This also means a new but equal value for `a` would NOT trigger such a
-change.
-
-Now literal values use an input-based watch similar to other directive/component
-one-way bindings. In this context inputs are the non-constant parts of the
-literal. In the example above the input would be `a`. Changes are only
-triggered when the inputs to the literal change.
-
-<hr />
-**Due to [1cf728](https://github.com/angular/angular.js/commit/1cf728e209a9e0016068fac2769827e8f747760e)**,
-`base[href]` was added to the list of RESOURCE_URL context attributes.
-
-Previously, `<base href="{{ $ctrl.baseUrl }}" />` would not require `baseUrl` to
-be trusted as a RESOURCE_URL. Now, `baseUrl` will be sent to `$sce`'s
-RESOURCE_URL checks. By default, it will break unless `baseUrl` is of the same
-origin as the application document.
-
-Refer to the
-[`$sce` API docs](https://code.angularjs.org/snapshot/docs/api/ng/service/$sce)
-for more info on how to trust a value in a RESOURCE_URL context.
-
-Also, concatenation in trusted contexts is not allowed, which means that the
-following won't work: `<base href="/something/{{ $ctrl.partialPath }}" />`.
-
-Either construct complex values in a controller (recommended):
-
-```js
-this.baseUrl = '/something/' + this.partialPath;
-```
-```html
-<base href="{{ $ctrl.baseUrl }}" />
-```
-
-Or use string concatenation in the interpolation expression (not recommended
-except for the simplest of cases):
-
-```html
-<base href="{{ '/something/' + $ctrl.partialPath }}" />
-```
-
-
-#### **$rootScope**
-
-**Due to ([c2b8fa](https://github.com/angular/angular.js/commit/c2b8fab0a480204374d561d6b9b3d47347ac5570))**,
-the arguments of `$watchGroup` callbacks have changed.
-
-Previously when using `$watchGroup` the entries in `newValues` and
-`oldValues` represented the *most recent change of each entry*.
-
-Now the entries in `oldValues` will always equal the `newValues` of the previous
-call of the listener. This means comparing the entries in `newValues` and
-`oldValues` can be used to determine which individual expressions changed.
-
-For example `$scope.$watchGroup(['a', 'b'], fn)` would previously:
-
-|  Action  |  newValue  |  oldValue  |
-|----------|------------|------------|
-|  (init)  | [undefined, undefined] | [undefined, undefined] |
-|  `a=1`   | [1, undefined] | [undefined, undefined] |
-|  `a=2`   | [2, undefined] | [1, undefined] |
-|  `b=3`   | [2, 3] | [1, undefined] |
-
-
-Now the `oldValue` will always equal the previous `newValue`:
-
-|  Action  |  newValue  |  oldValue  |
-|----------|------------|------------|
-|  (init)  | [undefined, undefined] | [undefined, undefined] |
-|  `a=1`   | [1, undefined] | [undefined, undefined] |
-|  `a=2`   | [2, undefined] | [1, undefined] |
-|  `b=3`   | [2, 3] | [2, undefined] |
-
-Note the last call now shows `a === 2` in the `oldValues` array.
-
-This also makes the `oldValue` of one-time watchers more clear. Previously
-the `oldValue` of a one-time watcher would remain `undefined` forever. For
-example `$scope.$watchGroup(['a', '::b'], fn)` would previously:
-
-|  Action  |  newValue  |  oldValue  |
-|----------|------------|------------|
-|  (init)  | [undefined, undefined] | [undefined, undefined] |
-|  `a=1`   | [1, undefined] | [undefined, undefined] |
-|  `b=2`   | [1, 2] | [undefined, undefined] |
-|  `a=b=3` | [3, 2] | [1, undefined] |
-
-Where now the `oldValue` will always equal the previous `newValue`:
-
-|  Action  |  newValue  |  oldValue  |
-|----------|------------|------------|
-|  (init)  | [undefined, undefined] | [undefined, undefined] |
-|  `a=1`   | [1, undefined] | [undefined, undefined] |
-|  `b=2`   | [1, 2] | [1, undefined] |
-|  `a=b=3` | [3, 2] | [1, 2] |
-
-
-#### **$interval**
-
-**Due to [a8bef9](https://github.com/angular/angular.js/commit/a8bef95127775d83d80daa4617c33227c4b443d4)**,
-`$interval.cancel() will throw an error if called with a promise that was not generated by
-`$interval()`. Previously, it would silently do nothing.
-
-Before:
-```js
-var promise = $interval(doSomething, 1000, 5).then(doSomethingElse);
-$interval.cancel(promise);  // No error; interval NOT canceled.
-```
-
-After:
-```js
-var promise = $interval(doSomething, 1000, 5).then(doSomethingElse);
-$interval.cancel(promise);  // Throws error.
-```
-
-Correct usage:
-```js
-var promise = $interval(doSomething, 1000, 5);
-var newPromise = promise.then(doSomethingElse);
-$interval.cancel(promise);  // Interval canceled.
-```
-
-
-#### **$timeout**
-
-**Due to [336525](https://github.com/angular/angular.js/commit/3365256502344970f86355d3ace1cb4251ae9828)**,
-`$timeout.cancel() will throw an error if called with a promise that was not generated by
-`$timeout()`. Previously, it would silently do nothing.
-
-Before:
-```js
-var promise = $timeout(doSomething, 1000).then(doSomethingElse);
-$timeout.cancel(promise);  // No error; timeout NOT canceled.
-```
-
-After:
-```js
-var promise = $timeout(doSomething, 1000).then(doSomethingElse);
-$timeout.cancel(promise);  // Throws error.
-```
-
-Correct usage:
-```js
-var promise = $timeout(doSomething, 1000);
-var newPromise = promise.then(doSomethingElse);
-$timeout.cancel(promise);  // Timeout canceled.
-```
-
-
-#### **$cookies**
-**Due to [73c646](https://github.com/angular/angular.js/commit/73c6467f1468353215dc689c019ed83aa4993c77)**,
-the `$cookieStore`service has been removed. Migrate to the $cookies service. Note that
-for object values you need to use the `putObject` & `getObject` methods as
-`get`/`put` will not correctly save/retrieve them.
-
-Before:
-```js
-$cookieStore.put('name', {key: 'value'});
-$cookieStore.get('name'); // {key: 'value'}
-$cookieStore.remove('name');
-```
-
-
-#### **$templateRequest**
-
-**Due to [c617d6](https://github.com/angular/angular.js/commit/c617d6dceee5b000bfceda44ced22fc16b48b18b)**,
-give tpload error namespace has changed. Previously the `tpload` error was namespaced to `$compile`.
-If you have code that matches errors of the form `[$compile:tpload]` it will no
-longer run. You should change the code to match
-`[$templateRequest:tpload]`.
-
-<hr />
-**Due to ([fb0099](https://github.com/angular/angular.js/commit/fb00991460cf69ae8bc7f1f826363d09c73c0d5e)**,
-the service now returns the result of `$templateCache.put()` when making a server request to the
-template. Previously it would return the content of the response directly.
-This now means if you are decorating `$templateCache.put()` to manipulate the template, you will
-now get this manipulated result also on the first `$templateRequest` rather than only on subsequent
-calls (when the template is retrived from the cache).
-In practice this should not affect any apps, as it is unlikely that they rely on the template being
-different in the first and subsequent calls.
-
-#### **$animate**
-**Due to [16b82c](https://github.com/angular/angular.js/commit/16b82c6afe0ab916fef1d6ca78053b00bf5ada83)**,
-$animate.cancel(runner) now rejects the underlying
-promise and calls the catch() handler on the runner
-returned by $animate functions (enter, leave, move,
-addClass, removeClass, setClass, animate).
-Previously it would resolve the promise as if the animation
-had ended successfully.
-
-Example:
-
-```js
-var runner = $animate.addClass('red');
-runner.then(function() { console.log('success')});
-runner.catch(function() { console.log('cancelled')});
-
-runner.cancel();
-```
-
-Pre-1.7.0, this logs 'success', 1.7.0 and later it logs 'cancelled'.
-To migrate, add a catch() handler to your animation runners.
-
-
-#### **$controller**
-
-**Due to [e269c1](https://github.com/angular/angular.js/commit/e269c14425a3209040f65c022658770e00a36f16)**,
-the option to instantiate controllers from constructors on the global `window` object
-has been removed. Likewise, the deprecated `$controllerProvider.allowGlobals()`
-method that could enable this behavior, has been removed.
-
-This behavior had been deprecated since AngularJS v1.3.0, because polluting the global scope
-is bad. To migrate, remove the call to $controllerProvider.allowGlobals() in the config, and
-register your controller via the Module API or the $controllerProvider, e.g.
-
-```
-angular.module('myModule', []).controller('myController', function() {...});
-
-angular.module('myModule', []).config(function($controllerProvider) {
-  $controllerProvider.register('myController', function() {...});
-});
-
-```
-
-#### **$sce**
-**Due to [1e9ead](https://github.com/angular/angular.js/commit/1e9eadcd72dbbd5c67dae8328a63e535cfa91ff9)**,
-if you use `attrs.$set` for URL attributes (a[href] and img[src]) there will no
-longer be any automated sanitization of the value. This is in line with other
-programmatic operations, such as writing to the innerHTML of an element.
-
-If you are programmatically writing URL values to attributes from untrusted
-input then you must sanitize it yourself. You could write your own sanitizer or copy
-the private `$$sanitizeUri` service.
-
-Note that values that have been passed through the `$interpolate` service within the
-`URL` or `MEDIA_URL` will have already been sanitized, so you would not need to sanitize
-these values again.
-
-
-
-<a name="migrate1.6to1.7-ng-filters"></a>
-### Core: _Filters_
-
-#### **orderBy**
-**Due to [1d8046](https://github.com/angular/angular.js/commit/1d804645f7656d592c90216a0355b4948807f6b8)**,
-when using `orderBy` to sort arrays containing `null` values, the `null` values
-will be considered "greater than" all other values, except for `undefined`.
-Previously, they were sorted as strings. This will result in different (but more
-intuitive) sorting order.
-
-Before:
-```js
-orderByFilter(['a', undefined, 'o', null, 'z']);
-//--> 'a', null, 'o', 'z', undefined
-```
-
-After:
-```js
-orderByFilter(['a', undefined, 'o', null, 'z']);
-//--> 'a', 'o', 'z', null, undefined
-```
-
-
-<a name="migrate1.6to1.7-ng-misc"></a>
-### Core: _Misceallenous_
-
-
-#### **jqLite**
-**Due to [b7d396](https://github.com/angular/angular.js/commit/b7d396b8b6e8f27a1f4556d58fc903321e8d532a)**,
-removeData() no longer removes event handlers.
-
-Before this commit `removeData()` invoked on an element removed its event
-handlers as well. If you want to trigger a full cleanup of an element, change:
-
-```js
-elem.removeData();
-```
-
-to:
-
-```js
-angular.element.cleanData(elem);
-```
-
-In most cases, though, cleaning up after an element is supposed to be done
-only when it's removed from the DOM as well; in such cases the following:
-
-```js
-elem.remove();
-```
-
-will remove event handlers as well.
-
-
-
-#### **Angular**
-
-**Due to [1daa4f](https://github.com/angular/angular.js/commit/1daa4f2231a89ee88345689f001805ffffa9e7de)**,
-the helper functions `angular.lowercase` `and angular.uppercase` have been removed.
-
-These functions have been deprecated since 1.5.0. They are internally
-used, but should not be exposed as they contain special locale handling
-(for Turkish) to maintain internal consistency regardless of user-set locale.
-
-Developers should generally use the built-ins `toLowerCase` and `toUpperCase`
-or `toLocaleLowerCase` and `toLocaleUpperCase` for special cases.
-
-Further, we generally discourage using the angular.x helpers in application code.
-
-<hr />
-**Due to [e3ece2](https://github.com/angular/angular.js/commit/e3ece2fad9e1e6d47b5f06815ff186d7e6f44948)**,
-`angular.isArray()` now supports Array subclasses.
-
-Previously, `angular.isArray()` was an alias for `Array.isArray()`.
-Therefore, objects that prototypally inherit from `Array` where not
-considered arrays. Now such objects are considered arrays too.
-
-This change affects several other methods that use `angular.isArray()`
-under the hood, such as `angular.copy()`, `angular.equals()`,
-`angular.forEach()`, and `angular.merge()`.
-
-This in turn affects how dirty checking treats objects that prototypally
-inherit from `Array` (e.g. MobX observable arrays). AngularJS will now
-be able to handle these objects better when copying or watching.
-
-
-<a name="migrate1.6to1.7-ngAria"></a>
-### ngAria
-
-**Due to [6d5ef3](https://github.com/angular/angular.js/commit/6d5ef34fc6a974cde73157ba94f9706723dd8f5b)**,
-the ngAria directive no longer sets aria-* attributes on input[type="hidden"] with ngModel.
-This can affect apps that test for the presence of aria attributes on hidden inputs.
-To migrate, remove these assertions.
-In actual apps, this should not have a user-facing effect, as the previous behavior
-was incorrect, and the new behavior is correct for accessibility.
-
-
-
-<a name="migrate1.6to1.7-ngResource"></a>
-### ngResource
-
-#### **$resource**
-**Due to [ea0585](https://github.com/angular/angular.js/commit/ea0585773bb93fd891576e2271254a17e15f1ddd)**,
-the behavior of interceptors and success/error callbacks has changed.
-
-If you are not using `success` or `error` callbacks with `$resource`,
-your app should not be affected by this change.
-
-If you are using `success` or `error` callbacks (with or without
-response interceptors), one (subtle) difference is that throwing an
-error inside the callbacks will not propagate to the returned
-`$promise`. Therefore, you should try to use the promises whenever
-possible. E.g.:
-
-```js
-// Avoid
-User.query(function onSuccess(users) { throw new Error(); }).
-  $promise.
-  catch(function onError() { /* Will not be called. */ });
-
-// Prefer
-User.query().
-  $promise.
-  then(function onSuccess(users) { throw new Error(); }).
-  catch(function onError() { /* Will be called. */ });
-```
-
-Finally, if you are using `success` or `error` callbacks with response
-interceptors, the callbacks will now always run _after_ the interceptors
-(and wait for them to resolve in case they return a promise).
-Previously, the `error` callback was called before the `responseError`
-interceptor and the `success` callback was synchronously called after
-the `response` interceptor. E.g.:
-
-```js
-var User = $resource('/api/users/:id', {id: '@id'}, {
-  get: {
-    method: 'get',
-    interceptor: {
-      response: function(response) {
-        console.log('responseInterceptor-1');
-        return $timeout(1000).then(function() {
-          console.log('responseInterceptor-2');
-          return response.resource;
-        });
-      },
-      responseError: function(response) {
-        console.log('responseErrorInterceptor-1');
-        return $timeout(1000).then(function() {
-          console.log('responseErrorInterceptor-2');
-          return $q.reject('Ooops!');
-        });
-      }
-    }
-  }
-});
-var onSuccess = function(value) { console.log('successCallback', value); };
-var onError = function(error) { console.log('errorCallback', error); };
-
-// Assuming the following call is successful...
-User.get({id: 1}, onSuccess, onError);
-  // Old behavior:
-  //   responseInterceptor-1
-  //   successCallback, {/* Promise object */}
-  //   responseInterceptor-2
-  // New behavior:
-  //   responseInterceptor-1
-  //   responseInterceptor-2
-  //   successCallback, {/* User object */}
-
-// Assuming the following call returns an error...
-User.get({id: 2}, onSuccess, onError);
-  // Old behavior:
-  //   errorCallback, {/* Response object */}
-  //   responseErrorInterceptor-1
-  //   responseErrorInterceptor-2
-  // New behavior:
-  //   responseErrorInterceptor-1
-  //   responseErrorInterceptor-2
-  //   errorCallback, Ooops!
-```
-
-<hr />
-**Due to [240a3d](https://github.com/angular/angular.js/commit/240a3ddbf12a9bb79754031be95dae4b6bd2dded)**,
-`$http` will be called asynchronously from `$resource` methods
-(regardless if a `request`/`requestError` interceptor has been defined).
-
-Previously, calling a `$resource` method would synchronously call
-`$http`.
-
-This is not expected to affect applications at runtime, since the
-overall operation is asynchronous already, but may affect assertions in
-tests. For example, if you want to assert that `$http` has been called
-with specific arguments as a result of a `$resource` call, you now need
-to run a `$digest` first, to ensure the (possibly empty) request
-interceptor promise has been resolved.
-
-Before:
-```js
-it('...', function() {
-  $httpBackend.expectGET('/api/things').respond(...);
-  var Things = $resource('/api/things');
-  Things.query();
-
-  expect($http).toHaveBeenCalledWith(...);
-});
-```
-
-After:
-```js
-it('...', function() {
-  $httpBackend.expectGET('/api/things').respond(...);
-  var Things = $resource('/api/things');
-  Things.query();
-  $rootScope.$digest();
-
-  expect($http).toHaveBeenCalledWith(...);
-});
-```
-
-
-
-<a name="migrate1.6to1.7-ngScenario"></a>
-### ngScenario
-
-**Due to[0cd392](https://github.com/angular/angular.js/commit/0cd39217828b0ad53eaf731576af17d66c18ff60)**,
-the angular scenario runner end-to-end test framework has been
-removed from the project and will no longer be available on npm
-or bower starting with 1.7.0.
-It was deprecated and removed from the documentation in 2014.
-Applications that still use it should migrate to
-[Protractor](http://www.protractortest.org).
-Technically, it should also be possible to continue using an
-older version of the scenario runner, as the underlying APIs have
-not changed. However, we do not guarantee future compatibility.
-
-
-<a name="migrate1.6to1.7-ngTouch"></a>
-### ngTouch
-
-**Due to [11d9ad](https://github.com/angular/angular.js/commit/11d9ad1eb25eaf5967195e424108207427835d50)**,
-the `ngClick` directive from the ngTouch module has been removed, and with it the
-corresponding `$touchProvider` and `$touch` service.
-
-If you have included ngTouch v1.5.0 or higher in your application, and have not
-changed the value of `$touchProvider.ngClickOverrideEnabled()`, or injected and used the `$touch`
-service, then there are no migration steps for your code. Otherwise you must remove references to
-the provider and service.
-
-The `ngClick` override directive had been deprecated and by default disabled since v1.5.0,
-because of buggy behavior in edge cases, and a general trend to avoid special touch based
-overrides of click events. In modern browsers, it should not be necessary to use a touch override
-library:
-
-- Chrome, Firefox, Edge, and Safari remove the 300ms delay when
-  `<meta name="viewport" content="width=device-width">` is set.
-- Internet Explorer 10+, Edge, Safari, and Chrome remove the delay on elements that have the
-  `touch-action` css property is set to `manipulation`.
-
-You can find out more in these articles:
-https://developers.google.com/web/updates/2013/12/300ms-tap-delay-gone-away
-https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_9_1.html#//apple_ref/doc/uid/TP40014305-CH10-SW8
-https://blogs.msdn.microsoft.com/ie/2015/02/24/pointer-events-w3c-recommendation-interoperable-touch-and-removing-the-dreaded-300ms-tap-delay/
-
-
-
 ## Migrating from 1.5 to 1.6
 
 AngularJS 1.6 fixes numerous bugs and adds new features, both in core and in external modules.
@@ -2030,7 +1272,7 @@ Due to [b71d7c3f](https://github.com/angular/angular.js/commit/b71d7c3f3c04e65b0
 falsy values (`''`, `0`, `false` and `null`) are properly recognized as option group identifiers for
 options passed to `ngOptions`. Previously, all of these values were ignored and the option was not
 assigned to any group. `undefined` is still interpreted as "no group".
-If you have options with falsy group identifiers that should still not be assigned to any group,
+If you have options with falsy group indentifiers that should still not be assigned to any group,
 then you must filter the values before passing them to `ngOptions`, converting falsy values to
 `undefined`.
 
@@ -2189,8 +1431,8 @@ For more info on the topic, you can take a look at this
 ## Migrating from 1.3 to 1.4
 
 AngularJS 1.4 fixes major animation issues and introduces a new API for `ngCookies`. Further, there
-are changes to `ngMessages`, `$compile`, `ngRepeat`, `ngOptions`, `ngPattern`, `pattern` and some fixes to core filters:
-`limitTo` and `filter`.
+are changes to `ngMessages`, `$compile`, `ngRepeat`, `ngOptions`, `ngPattern`, `pattern`, and
+some fixes to core filters: `limitTo` and `filter`.
 
 The reason for the ngAnimate refactor was to fix timing issues and to expose new APIs to allow
 for developers to construct more versatile animations.  We now have access to `$animateCss`

docs/content/guide/providers.ngdoc

@@ -188,6 +188,11 @@ myApp.service('unicornLauncher', ["apiToken", UnicornLauncher]);
 
 Much simpler!
 
+Note: Yes, we have called one of our service recipes 'Service'. We regret this and know that we'll
+be somehow punished for our misdeed. It's like we named one of our offspring 'Child'. Boy,
+that would mess with the teachers.
+
+
 ## Provider Recipe
 
 As already mentioned in the intro, the Provider recipe is the core recipe type and

docs/content/guide/scope.ngdoc

@@ -109,14 +109,12 @@ to test the behavior without being distracted by the rendering details.
 ## Scope Hierarchies
 
 Each AngularJS application has exactly one {@link ng.$rootScope root scope}, but
-may have any number of child scopes.
+may have several child scopes.
 
-The application can have multiple scopes, because {@link guide/directive directives} can create new
-child 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.
-
-The section {@link guide/scope#directives-that-create-scopes Directives that Create Scopes} has more
-info about which directives create 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.
 
 When AngularJS evaluates `{{name}}`, it first looks at the scope associated with the given
 element for the `name` property. If no such property is found, it searches the parent scope
@@ -185,11 +183,8 @@ To examine the scope in the debugger:
   2. The debugger allows you to access the currently selected element in the console as `$0`
     variable.
 
-  3. To retrieve the associated scope in console execute: `angular.element($0).scope()`
+  3. To retrieve the associated scope in console execute: `angular.element($0).scope()` or just type $scope
 
-<div class="alert alert-warning">
-  The `scope()` function is only available when {@link ng.$compileProvider#debugInfoEnabled `$compileProvider.debugInfoEnabled()`} is true (which is the default).
-</div>
 
 ## Scope Events Propagation
 
@@ -314,16 +309,12 @@ correctly.
 
 In most cases, {@link ng.$compileProvider#directive directives} and scopes interact
 but do not create new instances of scope. However, some directives, such as {@link
-ng.directive:ngController ng-controller} and {@link ng.directive:ngRepeat ng-repeat},
-create new child scopes and attach the child scope to the corresponding DOM element.
-
-A special type of scope is the `isolate` scope, which does not inherit prototypically from the parent scope.
-This type of scope is useful for component directives that should be isolated from their parent scope.
-See the {@link guide/directive#isolating-the-scope-of-a-directive directives guide} for
-more information about isolate scopes in custom directives.
-
-Note also that component directives, which are created with the
-{@link api/ng/type/angular.Module#component .component()} helper always create an isolate scope.
+ng.directive:ngController ng-controller} and {@link
+ng.directive:ngRepeat ng-repeat}, create new child scopes
+and attach the child scope to the corresponding DOM element. You can retrieve a scope for any DOM
+element by using an `angular.element(aDomElement).scope()` method call.
+See the {@link guide/directive#isolating-the-scope-of-a-directive
+directives guide} for more information about isolate scopes.
 
 ### Controllers and Scopes
 

docs/content/guide/unit-testing.ngdoc

@@ -149,17 +149,16 @@ for instantiating controllers.
 describe('PasswordController', function() {
   beforeEach(module('app'));
 
-  var $controller, $rootScope;
+  var $controller;
 
-  beforeEach(inject(function(_$controller_, _$rootScope_){
+  beforeEach(inject(function(_$controller_){
     // The injector unwraps the underscores (_) from around the parameter names when matching
     $controller = _$controller_;
-    $rootScope = _$rootScope_;
   }));
 
   describe('$scope.grade', function() {
     it('sets the strength to "strong" if the password length is >8 chars', function() {
-      var $scope = $rootScope.$new();
+      var $scope = {};
       var controller = $controller('PasswordController', { $scope: $scope });
       $scope.password = 'longerthaneightchars';
       $scope.grade();

docs/content/misc/downloading.ngdoc

@@ -111,7 +111,7 @@ The set of files included in each version directory are:
   * __`angular-route.js`__ — Routing and deep-linking services and directives for AngularJS apps.
       ({@link module:ngRoute API docs})
   * __`angular-sanitize.js`__ — Functionality to sanitize HTML. ({@link module:ngSanitize API docs})
-  * __`angular-touch.js`__ — Touch events for touch-enabled devices.
+  * __`angular-touch.js`__ — Touch events and other helpers for touch-enabled devices.
     ({@link module:ngTouch API docs})
 
 

docs/content/misc/faq.ngdoc

@@ -8,7 +8,7 @@
 
 ### Why is this project called "AngularJS"? Why is the namespace called "ng"?
 
-Because HTML has angular brackets and "ng" sounds like "AngularJS".
+Because HTML has AngularJS brackets and "ng" sounds like "AngularJS".
 
 
 ### Is AngularJS a library, framework, plugin or a browser extension?
@@ -39,7 +39,7 @@ When we are making a release we generate updates to the changelog directly from
 generated update contains a highlighted section that contains all the breaking changes that have been
 extracted from the commits. We can quickly see in the new changelog exactly what commits contain breaking
 changes and so can application developers when they are deciding whether to update to a new version of
-AngularJS.
+Angular.
 
 Features with non-breaking changes can also appear in the "patch" version, e.g. in version 1.6.3 there might
 be a feature that is not available in 1.6.2.
@@ -94,7 +94,8 @@ When adding new code to AngularJS, we have a very stringent commit policy:
 - Commit messages must be written in a specific manner that allows us to parse them and extract the changes
 for release notes ([see the contributing guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md))
 
-The AngularJS code base has a very large set of unit tests and end-to-end tests. This means that a breaking change will require one or more tests to be changed to allow the
+The AngularJS code base has a very large set of unit tests and end-to-end tests. This means that
+a breaking change will require one or more tests to be changed to allow the
 tests to pass. So when a commit includes tests that are being removed or modified, this is a flag that the
 code might include a breaking change. When reviewing the commit we can then decide whether there really is
 a breaking change and if it is appropriate for the branch to which it is being merged. If so, then we

docs/content/misc/version-support-status.ngdoc

@@ -1,62 +0,0 @@
-@ngdoc overview
-@name Version Support Status
-@description
-
-# Version Support Status
-
-This page describes the support status of the significant versions of AngularJS.
-
-<div class="alert alert-info">
-  AngularJS is planning one more significant release, version 1.7, and on July 1, 2018 it will enter a 3 year Long Term Support period.
-</div>
-
-### Until July 1st 2018
-
-Any version branch not shown in the following table (e.g. 1.5.x) is no longer being developed.
-
-<table class="dev-status table table-bordered">
-<thead>
-  <tr><th>Version</th><th>Status</th><th>Comments</th></tr>
-</thead>
-<tbody>
-  <tr class="security"><td><span>1.2.x</span></td><td>Security patches only</td><td>Last version to provide IE 8 support</td></tr>
-  <tr class="stable"><td><span>1.6.x</span></td><td>Patch Releases</td><td>Minor features, bug fixes, security patches - no breaking changes</td></tr>
-  <tr class="current"><td><span>1.7.x</span></td><td>Active Development</td><td>1.7.0 (not yet released) will be the last release of AngularJS to contain breaking changes</td></tr>
-</tbody>
-</table>
-
-### After July 1st 2018
-
-Any version branch not shown in the following table (e.g. 1.6.x) is no longer being developed.
-
-<table class="dev-status table table-bordered">
-  <thead>
-    <tr><th>Version</th><th>Status</th><th>Comments</th></tr>
-  </thead>
-  <tbody>
-    <tr class="security">
-      <td><span>1.2.x</span></td>
-      <td>Long Term Support</td>
-      <td>Last version to provide IE 8 support</td>
-    </tr>
-    <tr class="stable">
-      <td><span>1.7.x</span></td>
-      <td>Long Term Support</td>
-      <td>See {@link version-support-status#long-term-support Long Term Support} section below.</td>
-    </tr>
-  </tbody>
-</table>
-
-### Long Term Support
-
-On July 1st 2018, we will enter a Long Term Support period for AngularJS.
-
-At this time we will focus exclusively on providing fixes to bugs that satisfy at least one of the following criteria:
-
-* A security flaw is detected in the 1.7.x branch of the framework
-* One of the major browsers releases a version that will cause current production applications using AngularJS 1.7.x to stop working
-* The jQuery library releases a version that will cause current production applications using AngularJS 1.7.x to stop working.
-
-### Blog Post
-
-You can read more about these plans in our [blog post announcement](https://blog.angular.io/stable-angularjs-and-long-term-support-7e077635ee9c).

docs/content/tutorial/step_00.ngdoc

@@ -5,6 +5,7 @@
 
 <ul doc-tutorial-nav="0"></ul>
 
+
 In this step of the tutorial, you will become familiar with the most important source code files of
 the AngularJS Phonecat App. You will also learn how to start the development servers bundled with
 [angular-seed][angular-seed], and run the application in the browser.
@@ -166,7 +167,7 @@ For the purposes of this tutorial, we modified the angular-seed with the followi
 * Added a dependency on [Bootstrap](http://getbootstrap.com) in the `bower.json` file.
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -177,7 +178,7 @@ For the purposes of this tutorial, we modified the angular-seed with the followi
   ```
 
 
-## Summary
+# Summary
 
 Now let's go to {@link step_01 step 1} and add some content to the web app.
 

docs/content/tutorial/step_01.ngdoc

@@ -5,6 +5,7 @@
 
 <ul doc-tutorial-nav="1"></ul>
 
+
 In order to illustrate how AngularJS enhances standard HTML, you will create a purely *static* HTML
 page and then examine how we can turn this HTML code into a template that AngularJS will use to
 dynamically display the same result with any set of data.
@@ -36,7 +37,7 @@ In this step you will add some basic information about two cell phones to an HTM
 ```
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -47,7 +48,7 @@ In this step you will add some basic information about two cell phones to an HTM
   ```
 
 
-## Summary
+# Summary
 
 This addition to your app uses static HTML to display the list. Now, let's go to
 {@link step_02 step 2} to learn how to use AngularJS to dynamically generate the same list.

docs/content/tutorial/step_02.ngdoc

@@ -5,6 +5,7 @@
 
 <ul doc-tutorial-nav="2"></ul>
 
+
 Now, it's time to make the web page dynamic — with AngularJS. We will also add a test that verifies
 the code for the controller we are going to add.
 
@@ -147,24 +148,40 @@ To learn more about AngularJS scopes, see the {@link ng.$rootScope.Scope Angular
 </div>
 
 
-## Testing
+# Testing
 
-### Testing Controllers
+The "AngularJS way" of separating controller from the view, makes it easy to test code as it is being
+developed. If our controller were available on the global namespace, we could simply instantiate it
+with a mock scope object:
 
-The "AngularJS way" of separating the controller from the view makes it easy to test code as it is being
-developed. In the section "Model and Controller" we have registered our controller via a constructor
-function on the `phonecatApp` module.
+<br />
+```js
+describe('PhoneListController', function() {
 
-In tests, we use an AngularJS service, `$controller`, which will retrieve a controller by name. It
-also takes a second argument - a map of dependencies that should be injected.
+  it('should create a `phones` model with 3 phones', function() {
+    var scope = {};
+    var ctrl = new PhoneListController(scope);
 
-The following test instantiates `PhoneListController` with a mock scope object,
-and verifies that the phones array property on the scope contains three records.
+    expect(scope.phones.length).toBe(3);
+  });
 
-This example demonstrates how easy it is to create a unit test for
+});
+```
+
+The test instantiates `PhoneListController` and verifies that the phones array property on the
+scope contains three records. This example demonstrates how easy it is to create a unit test for
 code in AngularJS. Since testing is such a critical part of software development, we make it easy to
 create tests in AngularJS so that developers are encouraged to write them.
 
+
+## Testing non-global Controllers
+
+In practice, you will not want to have your controller functions in the global namespace. Instead,
+you can see that we have registered it via a constructor function on the `phonecatApp` module.
+
+In this case AngularJS provides a service, `$controller`, which will retrieve your controller by name.
+Here is the same test using `$controller`:
+
 <br />
 **`app/app.spec.js`:**
 
@@ -205,7 +222,7 @@ describe('PhoneListController', function() {
 </div>
 
 
-### Writing and Running Tests
+## Writing and Running Tests
 
 Many AngularJS developers prefer the syntax of
 [Jasmine's Behavior-Driven Development (BDD) framework][jasmine-home], when writing tests. Although
@@ -252,7 +269,7 @@ To run the tests, and then watch the files for changes execute: `npm test`
 </div>
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -307,7 +324,7 @@ To run the tests, and then watch the files for changes execute: `npm test`
   `toBe(4)`.
 
 
-## Summary
+# Summary
 
 We now have a dynamic application which separates models, views, and controllers, and we are testing
 as we go. Let's go to {@link step_03 step 3} to learn how to improve our application's architecture,

docs/content/tutorial/step_03.ngdoc

@@ -5,6 +5,7 @@
 
 <ul doc-tutorial-nav="3"></ul>
 
+
 In the previous step, we saw how a controller and a template worked together to convert a static
 HTML page into a dynamic view. This is a very common pattern in Single-Page Applications in general
 (and AngularJS applications in particular):
@@ -196,7 +197,7 @@ Voilà! The resulting output should look the same, but let's see what we have ga
 </div>
 
 
-## Testing
+# Testing
 
 Although we have combined our controller with a template into a component, we still can (and should)
 unit test the controller separately, since this is where our application logic and data reside.
@@ -239,12 +240,12 @@ verifies that the phones array property on it contains three records. Note that
 the controller instance itself, not on a `scope`.
 
 
-### Running Tests
+## Running Tests
 
 Same as before, execute `npm test` to run the tests and then watch the files for changes.
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -266,7 +267,7 @@ Same as before, execute `npm test` to run the tests and then watch the files for
   throughout the application, is a big win.
 
 
-## Summary
+# Summary
 
 You have learned how to organize your application and presentation logic into isolated, reusable
 components. Let's go to {@link step_04 step 4} to learn how to organize our code in directories and

docs/content/tutorial/step_04.ngdoc

@@ -265,7 +265,7 @@ After all the refactorings that took place, this is how our application looks fr
 ```
 
 
-## Testing
+# Testing
 
 Since this was just a refactoring step (no actual code addition/deletions), we shouldn't need to
 change much (if anything) as far as our specs are concerned.
@@ -301,7 +301,7 @@ pass.
 </div>
 
 
-## Summary
+# Summary
 
 Even if we didn't add any new and exciting functionality to our application, we have made a great
 step towards a well-architected and maintainable application. Time to spice things up. Let's go to

docs/content/tutorial/step_05.ngdoc

@@ -78,7 +78,7 @@ following:
   by the `filter` filter. The process is completely transparent to the developer.
 
 
-## Testing
+# Testing
 
 In previous steps, we learned how to write and run unit tests. Unit tests are perfect for testing
 controllers and other parts of our application written in JavaScript, but they can't easily
@@ -124,7 +124,7 @@ easy it is to write E2E tests in AngularJS. Although this example is for a simpl
 that easy to set up any functional, readable, E2E test.
 
 
-### Running E2E Tests with Protractor
+## Running E2E Tests with Protractor
 
 Even though the syntax of this test looks very much like our controller unit test written with
 Jasmine, the E2E test uses APIs of [Protractor][protractor]. Read about the Protractor APIs in the
@@ -142,7 +142,7 @@ To rerun the test suite, execute `npm run protractor` again.
 </div>
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -155,7 +155,7 @@ To rerun the test suite, execute `npm run protractor` again.
   Component isolation at work!
 
 
-## Summary
+# Summary
 
 We have now added full-text search and included a test to verify that it works! Now let's go on to
 {@link step_06 step 6} to learn how to add sorting capabilities to the PhoneCat application.

docs/content/tutorial/step_06.ngdoc

@@ -124,7 +124,7 @@ will be reordered. That is the data-binding doing its job in the opposite direct
 the model.
 
 
-## Testing
+# Testing
 
 The changes we made should be verified with both a unit test and an E2E test. Let's look at the unit
 test first.
@@ -217,7 +217,7 @@ The E2E test verifies that the ordering mechanism of the select box is working c
 You can now rerun `npm run protractor` to see the tests run.
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -232,7 +232,7 @@ You can now rerun `npm run protractor` to see the tests run.
   `<option value="-age">Oldest</option>`
 
 
-## Summary
+# Summary
 
 Now that you have added list sorting and tested the application, go to {@link step_07 step 7} to
 learn about AngularJS services and how AngularJS uses dependency injection.

docs/content/tutorial/step_07.ngdoc

@@ -180,7 +180,7 @@ let's add the annotations to our `PhoneListController`:
 ```
 
 
-## Testing
+# Testing
 
 Because we started using dependency injection and our controller has dependencies, constructing the
 controller in our tests is a bit more complicated. We could use the `new` operator and provide the
@@ -283,7 +283,7 @@ Chrome 49.0: Executed 2 of 2 SUCCESS (0.133 secs / 0.097 secs)
 ```
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -299,7 +299,7 @@ Chrome 49.0: Executed 2 of 2 SUCCESS (0.133 secs / 0.097 secs)
   ```
 
 
-## Summary
+# Summary
 
 Now that you have learned how easy it is to use AngularJS services (thanks to AngularJS's dependency
 injection), go to {@link step_08 step 8}, where you will add some thumbnail images of phones and

docs/content/tutorial/step_08.ngdoc

@@ -70,7 +70,7 @@ which it would have done if we had only specified an attribute binding in a regu
 HTTP request to an invalid location.
 
 
-## Testing
+# Testing
 
 <br />
 **`e2e-tests/scenarios.js`**:
@@ -95,7 +95,7 @@ views, that we will implement in the upcoming steps.
 You can now rerun `npm run protractor` to see the tests run.
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -108,7 +108,7 @@ You can now rerun `npm run protractor` to see the tests run.
   inject the valid address.
 
 
-## Summary
+# Summary
 
 Now that you have added phone images and links, go to {@link step_09 step 9} to learn about AngularJS
 layout templates and how AngularJS makes it easy to create applications that have multiple views.

docs/content/tutorial/step_09.ngdoc

@@ -334,7 +334,7 @@ The takeaway here is:
 </div>
 
 
-## Testing
+# Testing
 
 Since some of our modules depend on {@link ngRoute ngRoute} now, it is necessary to update the Karma
 configuration file with angular-route. Other than that, the unit tests should (still) pass without
@@ -398,7 +398,7 @@ various URLs and verifying that the correct view was rendered.
 You can now rerun `npm run protractor` to see the tests run (and hopefully pass).
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -415,7 +415,7 @@ You can now rerun `npm run protractor` to see the tests run (and hopefully pass)
   component isolation at work!
 
 
-## Summary
+# Summary
 
 With the routing set up and the phone list view implemented, we are ready to go to
 {@link step_10 step 10} and implement a proper phone details view.

docs/content/tutorial/step_10.ngdoc

@@ -122,7 +122,7 @@ including lists and bindings that comprise the phone details. Note how we use th
 <img class="diagram" src="img/tutorial/tutorial_10.png">
 
 
-## Testing
+# Testing
 
 We wrote a new unit test that is similar to the one we wrote for the `phoneList` component's
 controller in {@link step_07#testing step 7}.
@@ -194,7 +194,7 @@ heading on the page is "Nexus S".
 You can run the tests with `npm run protractor`.
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -202,7 +202,7 @@ You can run the tests with `npm run protractor`.
   images on the 'Nexus S' details page.
 
 
-## Summary
+# Summary
 
 Now that the phone details view is in place, proceed to {@link step_11 step 11} to learn how to
 write your own custom display filter.

docs/content/tutorial/step_11.ngdoc

@@ -104,7 +104,7 @@ Let's employ the filter in the phone details template:
 ```
 
 
-## Testing
+# Testing
 
 Filters, like any other code, should be tested. Luckily, these tests are very easy to write.
 
@@ -146,7 +146,7 @@ Chrome 49.0: Executed 4 of 4 SUCCESS (0.091 secs / 0.075 secs)
 ```
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -167,7 +167,7 @@ Chrome 49.0: Executed 4 of 4 SUCCESS (0.091 secs / 0.075 secs)
   ```
 
 
-## Summary
+# Summary
 
 Now that we have learned how to write and test a custom filter, let's go to {@link step_12 step 12}
 to learn how we can use AngularJS to enhance the phone details page further.

docs/content/tutorial/step_12.ngdoc

@@ -73,7 +73,7 @@ thumbnail image.
 <img class="diagram" src="img/tutorial/tutorial_12.png">
 
 
-## Testing
+# Testing
 
 To verify this new feature, we added two E2E tests. One verifies that `mainImageUrl` is set to the
 first phone image URL by default. The second test clicks on several thumbnail images and verifies
@@ -151,7 +151,7 @@ property to the controller. As previously, we will use a mocked response.
 Our unit tests should now be passing again.
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -176,7 +176,7 @@ Our unit tests should now be passing again.
   Now, whenever you double-click on a thumbnail, an alert pops-up. Pretty annoying!
 
 
-## Summary
+# Summary
 
 With the phone image swapper in place, we are ready for {@link step_13 step 13} to learn an even
 better way to fetch data.

docs/content/tutorial/step_13.ngdoc

@@ -310,7 +310,7 @@ Chrome 49.0: Executed 5 of 5 SUCCESS (0.123 secs / 0.104 secs)
 ```
 
 
-## Summary
+# Summary
 
 Now that we have seen how to build a custom service as a RESTful client, we are ready for
 {@link step_14 step 14} to learn how to enhance the user experience with animations.

docs/content/tutorial/step_14.ngdoc

@@ -503,7 +503,7 @@ element). A boolean parameter (`wasCanceled`) is passed to the function, letting
 if the animation was canceled or not. Use this function to do any necessary clean-up.
 
 
-## Experiments
+# Experiments
 
 <div></div>
 
@@ -544,7 +544,7 @@ if the animation was canceled or not. Use this function to do any necessary clea
 * Go crazy and come up with your own funky animations!
 
 
-## Summary
+# Summary
 
 Our application is now much more pleasant to use, thanks to the smooth transitions between pages
 and UI states.

karma-shared.conf.js

@@ -104,36 +104,30 @@ module.exports = function(config, specificOptions) {
         platform: 'Windows 10',
         version: 'latest-1'
       },
-      'SL_iOS_10': {
+      'SL_iOS': {
         base: 'SauceLabs',
         browserName: 'iphone',
-        platform: 'OS X 10.12',
-        version: '10.3'
-      },
-      'SL_iOS_11': {
-        base: 'SauceLabs',
-        browserName: 'iphone',
-        platform: 'OS X 10.12',
-        version: '11.2'
+        platform: 'OS X 10.10',
+        version: '8.1'
       },
 
       'BS_Chrome': {
         base: 'BrowserStack',
         browser: 'chrome',
         os: 'OS X',
-        os_version: 'Sierra'
+        os_version: 'Yosemite'
       },
       'BS_Safari': {
         base: 'BrowserStack',
         browser: 'safari',
         os: 'OS X',
-        os_version: 'Sierra'
+        os_version: 'Yosemite'
       },
       'BS_Firefox': {
         base: 'BrowserStack',
         browser: 'firefox',
         os: 'Windows',
-        os_version: '10'
+        os_version: '8'
       },
       'BS_IE_9': {
         base: 'BrowserStack',
@@ -162,17 +156,11 @@ module.exports = function(config, specificOptions) {
         os: 'Windows',
         os_version: '10'
       },
-      'BS_iOS_10': {
+      'BS_iOS': {
         base: 'BrowserStack',
-        device: 'iPhone 7',
+        device: 'iPhone 6S',
         os: 'ios',
-        os_version: '10.0'
-      },
-      'BS_iOS_11': {
-        base: 'BrowserStack',
-        device: 'iPhone 8',
-        os: 'ios',
-        os_version: '11.0'
+        os_version: '9.3'
       }
     }
   });

lib/grunt/utils.js

@@ -297,13 +297,10 @@ module.exports = {
   // Our Firebase projects are in subfolders, but Travis expects them in the root,
   // so we need to modify the upload folder path and copy the file into the root
   firebaseDocsJsonForTravis: function() {
-    var docsScriptFolder = 'scripts/docs.angularjs.org-firebase';
-
-    var fileName = docsScriptFolder + '/firebase.json';
+    var fileName = 'scripts/docs.angularjs.org-firebase/firebase.json';
     var json = grunt.file.readJSON(fileName);
 
-    (json.hosting || (json.hosting = {})).public = 'deploy/docs';
-    (json.functions || (json.functions = {})).source = docsScriptFolder + '/functions';
+    json.hosting.public = 'uploadDocs';
 
     grunt.file.write('firebase.json', JSON.stringify(json));
   }

package.json

@@ -1,8 +1,8 @@
 {
   "name": "angularjs",
   "license": "MIT",
-  "branchVersion": "^1.7.0",
-  "branchPattern": "1.7.*",
+  "branchVersion": "^1.6.0",
+  "branchPattern": "1.6.*",
   "distTag": "latest",
   "repository": {
     "type": "git",
@@ -32,9 +32,8 @@
     "commitplease": "^2.7.10",
     "cross-spawn": "^4.0.0",
     "cz-conventional-changelog": "1.1.4",
-    "dgeni": "^0.4.9",
-    "dgeni-packages": "^0.26.2",
-    "eslint-plugin-promise": "^3.6.0",
+    "dgeni": "^0.4.0",
+    "dgeni-packages": "^0.16.4",
     "event-stream": "~3.1.0",
     "glob": "^6.0.1",
     "google-code-prettify": "1.0.1",
@@ -71,6 +70,7 @@
     "karma-ie-launcher": "^1.0.0",
     "karma-jasmine": "^1.1.0",
     "karma-junit-reporter": "^1.2.0",
+    "karma-ng-scenario": "^1.0.0",
     "karma-safari-launcher": "^1.0.0",
     "karma-sauce-launcher": "^1.2.0",
     "karma-script-launcher": "^1.0.0",

scripts/code.angularjs.org-firebase/functions/index.js

@@ -6,8 +6,8 @@ const path = require('path');
 
 const gcsBucketId = `${process.env.GCLOUD_PROJECT}.appspot.com`;
 
-const BROWSER_CACHE_DURATION = 60 * 10;
-const CDN_CACHE_DURATION = 60 * 60 * 12;
+const BROWSER_CACHE_DURATION = 300;
+const CDN_CACHE_DURATION = 600;
 
 function sendStoredFile(request, response) {
   let filePathSegments = request.path.split('/').filter((segment) => {
@@ -31,7 +31,7 @@ function sendStoredFile(request, response) {
   }
 
   if (!fileName) {
-    // Root
+    //Root
     return getDirectoryListing('/').catch(sendErrorResponse);
   }
 
@@ -111,11 +111,6 @@ function sendStoredFile(request, response) {
     return getContent(getFilesOptions).then(() => {
       let contentList = '';
 
-      if (path === '/') {
-        // Let the latest versions appear first
-        directoryList.reverse();
-      }
-
       directoryList.forEach(directoryPath => {
         const dirName = directoryPath.split('/').reverse()[1];
         contentList += `<a href="${dirName}/">${dirName}/</a><br>`;
@@ -130,20 +125,11 @@ function sendStoredFile(request, response) {
       // without trailing slash
       const base = request.originalUrl.endsWith('/') ? request.originalUrl : request.originalUrl + '/';
 
-      const directoryListing = `
-        <!DOCTYPE html>
-        <html lang="en">
-          <head>
-            <meta charset="utf-8" />
-            <meta name="viewport" content="width=device-width, initial-scale=1">
-            <base href="${base}">
-          </head>
-          <body>
-            <h1>Index of ${path}</h1>
-            <hr>
-            <pre>${contentList}</pre>
-          </body>
-        </html>`;
+      let directoryListing = `
+        <base href="${base}">
+        <h1>Index of ${path}</h1>
+        <hr>
+        <pre>${contentList}</pre>`;
 
       return response
         .status(200)

scripts/code.angularjs.org-firebase/public/robots.txt

@@ -1,6 +1,5 @@
 User-agent: *
 
-Disallow: /*docs*/
+Disallow: /*docs/
 Disallow: /*i18n/
 Disallow: /*.zip$
-Allow: /snapshot/docs/js/all-versions-data.js

scripts/docs.angularjs.org-firebase/firebase.json

@@ -1,6 +1,11 @@
 {
   "hosting": {
-    "public": "../../deploy/docs",
+    "public": "../../uploadDocs",
+    "ignore": [
+      "/index.html",
+      "/index-debug.html",
+      "/index-jquery.html"
+    ],
     "redirects": [
       {
         "source": "/error/:namespace\\::error*",
@@ -10,32 +15,17 @@
     ],
     "rewrites": [
       {
-        "source": "**/*!(.@(jpg|jpeg|gif|png|html|js|map|json|css|svg|ttf|txt|woff|woff2|eot|xml))",
-        "function": "sendFile"
-      }
-    ],
-    "headers": [
-      {
-        "source": "/examples/**.csp/*.html",
-        "headers": [{
-          "key": "Content-Security-Policy",
-          "value": "default-src 'self'"
-        }]
+        "source": "/",
+        "destination": "/index-production.html"
       },
       {
-        "source": "/Error404.html",
-        "headers" : [{
-          "key" : "X-Robots-Tag",
-          "value" : "noindex"
-        }]
+        "source": "/index.html",
+        "destination": "/index-production.html"
       },
       {
-        "source": "/@(partials|examples)/**",
-        "headers" : [{
-          "key" : "X-Robots-Tag",
-          "value" : "noindex"
-        }]
+        "source": "**/*!(.jpg|.jpeg|.gif|.png|.html|.js|.map|.json|.css|.svg|.ttf|.woff|.woff2|.eot)",
+        "destination": "/index-production.html"
       }
     ]
   }
-}
+}

scripts/docs.angularjs.org-firebase/functions/index.js

@@ -1,49 +0,0 @@
-'use strict';
-
-const functions = require('firebase-functions');
-const fs = require('fs');
-
-const BROWSER_CACHE_DURATION = 60 * 60;
-const CDN_CACHE_DURATION = 60 * 60 * 12;
-
-const headers = {
-  'Cache-Control': `public max-age=${BROWSER_CACHE_DURATION} s-maxage=${CDN_CACHE_DURATION}`
-};
-
-const buildSnapshot = data => `<!DOCTYPE html>
-  <html lang="en">
-    <head>
-      <meta charset="utf-8" />
-      <meta name="viewport" content="width=device-width, initial-scale=1">
-      <base href="/">
-    </head>
-    <body>
-      ${data}
-    </body>
-  </html>`;
-
-function sendFile(request, response) {
-
-  const snapshotRequested = typeof request.query._escaped_fragment_ !== 'undefined';
-  const filePath = `content/${snapshotRequested ? `partials${request.path}` : 'index'}.html`;
-
-  if (snapshotRequested) {
-    fs.readFile(filePath, {encoding: 'utf8'}, (error, data) => {
-      if (error) {
-        response
-          .status(404)
-          .end();
-      } else {
-        response
-          .set(headers)
-          .send(buildSnapshot(data));
-      }
-    });
-  } else {
-    response
-      .set(headers)
-      .sendFile(filePath, {root: __dirname});
-  }
-}
-
-exports.sendFile = functions.https.onRequest(sendFile);

scripts/docs.angularjs.org-firebase/functions/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "functions",
-  "description": "Cloud Functions for Firebase",
-  "scripts": {
-    "lint": "eslint .",
-    "serve": "firebase serve --only functions",
-    "shell": "firebase experimental:functions:shell",
-    "start": "npm run shell",
-    "deploy": "firebase deploy --only functions",
-    "logs": "firebase functions:log"
-  },
-  "dependencies": {
-    "firebase-admin": "~5.8.1",
-    "firebase-functions": "^0.8.1"
-  },
-  "devDependencies": {
-    "eslint": "^4.12.0",
-    "eslint-plugin-promise": "^3.6.0"
-  },
-  "private": true
-}

scripts/docs.angularjs.org-firebase/readme.firebase.docs.md

@@ -1,23 +1,10 @@
 Firebase for docs.angularjs.org
 ===============================
 
-# Continuous integration
-
 The docs are deployed to Google Firebase hosting via Travis deployment config, which expects
-firebase.json in the repository root, which is done by a Grunt task (firebaseDocsJsonForTravis)
-that modifies the paths in the firebase.json and copies it into the repository root.
+firebase.json and .firebaserc in the repository root.
 
-See travis.yml for the complete deployment config, and scripts/travis/build.sh for the full deployment
-build steps.
-
-# Serving locally:
-
-- Run `grunt:prepareDeploy`.
-  This copies docs content files into deploy/docs and the partials for Search Engine AJAX
-  Crawling into ./functions/content.
-
-- Run `firebase serve --only functions,hosting`
-  Creates a server at localhost:5000 that serves from deploy/docs and uses the local function
+See travis.yml for the complete deployment config.
 
 See /scripts/code.angularjs.org-firebase/readme.firebase.code.md for the firebase deployment to
-code.angularjs.org
+code.angularjs.org

scripts/jenkins/build.sh

@@ -12,7 +12,7 @@ set -xe
 # This is the default set of browsers to use on the CI server unless overridden via env variable
 if [[ -z "$BROWSERS" ]]
 then
-  BROWSERS="Chrome"
+  BROWSERS="Chrome,Firefox,/Users/jenkins/bin/safari.sh"
 fi
 
 # CLEAN #

scripts/travis/build.sh

@@ -2,23 +2,18 @@
 
 set -e
 
-readonly THIS_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); pwd)
-readonly ROOT_DIR="$THIS_DIR/../.."
-
 export BROWSER_STACK_ACCESS_KEY
 export SAUCE_ACCESS_KEY
 
 BROWSER_STACK_ACCESS_KEY=$(echo "$BROWSER_STACK_ACCESS_KEY" | rev)
 SAUCE_ACCESS_KEY=$(echo "$SAUCE_ACCESS_KEY" | rev)
 
-# TODO: restore "SL_EDGE-1" once Sauce Labs adds Edge 17 and "SL_EDGE-1" refers
-# to version 16. Edge 15 disconnects from Karma frequently causing extreme build instability.
 BROWSERS="SL_Chrome,SL_Chrome-1,\
 SL_Firefox,SL_Firefox-1,\
 SL_Safari,SL_Safari-1,\
-SL_iOS_10,SL_iOS_11,\
+SL_iOS,\
 SL_IE_9,SL_IE_10,SL_IE_11,\
-SL_EDGE"
+SL_EDGE,SL_EDGE-1"
 
 case "$JOB" in
   "ci-checks")
@@ -84,15 +79,7 @@ case "$JOB" in
     fi
 
     if [[ "$DEPLOY_DOCS" == true || "$DEPLOY_CODE" == true ]]; then
-      grunt prepareDeploy
-
-      if [[ "$DEPLOY_DOCS" == true ]]; then
-        # Install npm dependencies for Firebase functions.
-        (
-          cd "$ROOT_DIR/scripts/docs.angularjs.org-firebase/functions"
-          npm install
-        )
-      fi
+      grunt prepareFirebaseDeploy
     else
       echo "Skipping deployment build because conditions have not been met."
     fi
@@ -107,4 +94,4 @@ case "$JOB" in
       or\
       'deploy'."
     ;;
-esac
+esac

src/.eslintrc.json

@@ -28,6 +28,8 @@
     "REGEX_STRING_REGEXP" : false,
     "lowercase": false,
     "uppercase": false,
+    "manualLowercase": false,
+    "manualUppercase": false,
     "isArrayLike": false,
     "forEach": false,
     "forEachSorted": false,
@@ -77,7 +79,6 @@
     "toJsonReplacer": false,
     "toJson": false,
     "fromJson": false,
-    "addDateMinutes": false,
     "convertTimezoneToLocal": false,
     "timezoneToOffset": false,
     "startingTag": false,
@@ -159,8 +160,6 @@
     /* urlUtils.js */
     "urlResolve": false,
     "urlIsSameOrigin": false,
-    "urlIsSameOriginAsBaseUrl": false,
-    "urlIsAllowedOriginFactory": false,
 
     /* ng/controller.js */
     "identifierForController": false,

src/Angular.js

@@ -21,6 +21,8 @@
 
   lowercase,
   uppercase,
+  manualLowercase,
+  manualUppercase,
   nodeName_,
   isArrayLike,
   forEach,
@@ -73,7 +75,6 @@
   fromJson,
   convertTimezoneToLocal,
   timezoneToOffset,
-  addDateMinutes,
   startingTag,
   tryDecodeURIComponent,
   parseKeyValue,
@@ -128,7 +129,15 @@ var VALIDITY_STATE_PROPERTY = 'validity';
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
 /**
- * @private
+ * @ngdoc function
+ * @name angular.lowercase
+ * @module ng
+ * @kind function
+ *
+ * @deprecated
+ * sinceVersion="1.5.0"
+ * removeVersion="1.7.0"
+ * Use [String.prototype.toLowerCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase) instead.
  *
  * @description Converts the specified string to lowercase.
  * @param {string} string String to be converted to lowercase.
@@ -137,7 +146,15 @@ var hasOwnProperty = Object.prototype.hasOwnProperty;
 var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
 
 /**
- * @private
+ * @ngdoc function
+ * @name angular.uppercase
+ * @module ng
+ * @kind function
+ *
+ * @deprecated
+ * sinceVersion="1.5.0"
+ * removeVersion="1.7.0"
+ * Use [String.prototype.toUpperCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase) instead.
  *
  * @description Converts the specified string to uppercase.
  * @param {string} string String to be converted to uppercase.
@@ -146,6 +163,31 @@ var lowercase = function(string) {return isString(string) ? string.toLowerCase()
 var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
 
 
+var manualLowercase = function(s) {
+  /* eslint-disable no-bitwise */
+  return isString(s)
+      ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
+      : s;
+  /* eslint-enable */
+};
+var manualUppercase = function(s) {
+  /* eslint-disable no-bitwise */
+  return isString(s)
+      ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
+      : s;
+  /* eslint-enable */
+};
+
+
+// String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish
+// locale, for this reason we need to detect this case and redefine lowercase/uppercase methods
+// with correct but slower alternatives. See https://github.com/angular/angular.js/issues/11387
+if ('i' !== 'I'.toLowerCase()) {
+  lowercase = manualLowercase;
+  uppercase = manualUppercase;
+}
+
+
 var
     msie,             // holds major version number for IE, or NaN if UA is not IE.
     jqLite,           // delay binding since jQuery could be loaded after us.
@@ -193,7 +235,8 @@ function isArrayLike(obj) {
 
   // NodeList objects (with `item` method) and
   // other objects with suitable length characteristics are array-like
-  return isNumber(length) && (length >= 0 && (length - 1) in obj || typeof obj.item === 'function');
+  return isNumber(length) &&
+    (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item === 'function');
 
 }
 
@@ -608,14 +651,12 @@ function isDate(value) {
  * @kind function
  *
  * @description
- * Determines if a reference is an `Array`.
+ * Determines if a reference is an `Array`. Alias of Array.isArray.
  *
  * @param {*} value Reference to check.
  * @returns {boolean} True if `value` is an `Array`.
  */
-function isArray(arr) {
-  return Array.isArray(arr) || arr instanceof Array;
-}
+var isArray = Array.isArray;
 
 /**
  * @description
@@ -1343,7 +1384,7 @@ function convertTimezoneToLocal(date, timezone, reverse) {
  */
 function startingTag(element) {
   element = jqLite(element).clone().empty();
-  var elemHtml = jqLite('<div></div>').append(element).html();
+  var elemHtml = jqLite('<div>').append(element).html();
   try {
     return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) :
         elemHtml.
@@ -1898,25 +1939,25 @@ function bindJQuery() {
       injector: JQLitePrototype.injector,
       inheritedData: JQLitePrototype.inheritedData
     });
+
+    // All nodes removed from the DOM via various jQuery APIs like .remove()
+    // are passed through jQuery.cleanData. Monkey-patch this method to fire
+    // the $destroy event on all removed nodes.
+    originalCleanData = jQuery.cleanData;
+    jQuery.cleanData = function(elems) {
+      var events;
+      for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+        events = jQuery._data(elem, 'events');
+        if (events && events.$destroy) {
+          jQuery(elem).triggerHandler('$destroy');
+        }
+      }
+      originalCleanData(elems);
+    };
   } else {
     jqLite = JQLite;
   }
 
-  // All nodes removed from the DOM via various jqLite/jQuery APIs like .remove()
-  // are passed through jqLite/jQuery.cleanData. Monkey-patch this method to fire
-  // the $destroy event on all removed nodes.
-  originalCleanData = jqLite.cleanData;
-  jqLite.cleanData = function(elems) {
-    var events;
-    for (var i = 0, elem; (elem = elems[i]) != null; i++) {
-      events = jqLite._data(elem).events;
-      if (events && events.$destroy) {
-        jqLite(elem).triggerHandler('$destroy');
-      }
-    }
-    originalCleanData(elems);
-  };
-
   angular.element = jqLite;
 
   // Prevent double-proxying.

src/AngularPublic.js

@@ -28,7 +28,6 @@
   ngInitDirective,
   ngNonBindableDirective,
   ngPluralizeDirective,
-  ngRefDirective,
   ngRepeatDirective,
   ngShowDirective,
   ngStyleDirective,
@@ -151,6 +150,8 @@ function publishExternalAPI(angular) {
     'isArray': isArray,
     'version': version,
     'isDate': isDate,
+    'lowercase': lowercase,
+    'uppercase': uppercase,
     'callbacks': {$$counter: 0},
     'getTestability': getTestability,
     'reloadWithDebugInfo': reloadWithDebugInfo,
@@ -158,9 +159,7 @@ function publishExternalAPI(angular) {
     '$$csp': csp,
     '$$encodeUriSegment': encodeUriSegment,
     '$$encodeUriQuery': encodeUriQuery,
-    '$$lowercase': lowercase,
-    '$$stringify': stringify,
-    '$$uppercase': uppercase
+    '$$stringify': stringify
   });
 
   angularModule = setupModuleLoader(window);
@@ -195,7 +194,6 @@ function publishExternalAPI(angular) {
             ngInit: ngInitDirective,
             ngNonBindable: ngNonBindableDirective,
             ngPluralize: ngPluralizeDirective,
-            ngRef: ngRefDirective,
             ngRepeat: ngRepeatDirective,
             ngShow: ngShowDirective,
             ngStyle: ngStyleDirective,

src/auto/injector.js

@@ -922,7 +922,9 @@ function createInjector(modulesToLoad, strictDi) {
       }
       var result = func.$$ngIsClass;
       if (!isBoolean(result)) {
-        result = func.$$ngIsClass = /^class\b/.test(stringifyFn(func));
+        // Support: Edge 12-13 only
+        // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+        result = func.$$ngIsClass = /^(?:class\b|constructor\()/.test(stringifyFn(func));
       }
       return result;
     }

src/jqLite.js

@@ -54,8 +54,7 @@
  *
  * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
  * - [`after()`](http://api.jquery.com/after/)
- * - [`append()`](http://api.jquery.com/append/) - Contrary to jQuery, this doesn't clone elements
- *   so will not work correctly when invoked on a jqLite object containing more than one DOM node
+ * - [`append()`](http://api.jquery.com/append/)
  * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
  * - [`bind()`](http://api.jquery.com/bind/) (_deprecated_, use [`on()`](http://api.jquery.com/on/)) - Does not support namespaces, selectors or eventData
  * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
@@ -311,28 +310,6 @@ function jqLiteDealoc(element, onlyDescendants) {
   }
 }
 
-function isEmptyObject(obj) {
-  var name;
-
-  for (name in obj) {
-    return false;
-  }
-  return true;
-}
-
-function removeIfEmptyData(element) {
-  var expandoId = element.ng339;
-  var expandoStore = expandoId && jqCache[expandoId];
-
-  var events = expandoStore && expandoStore.events;
-  var data = expandoStore && expandoStore.data;
-
-  if ((!data || isEmptyObject(data)) && (!events || isEmptyObject(events))) {
-    delete jqCache[expandoId];
-    element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
-  }
-}
-
 function jqLiteOff(element, type, fn, unsupported) {
   if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument');
 
@@ -369,8 +346,6 @@ function jqLiteOff(element, type, fn, unsupported) {
       }
     });
   }
-
-  removeIfEmptyData(element);
 }
 
 function jqLiteRemoveData(element, name) {
@@ -380,11 +355,17 @@ function jqLiteRemoveData(element, name) {
   if (expandoStore) {
     if (name) {
       delete expandoStore.data[name];
-    } else {
-      expandoStore.data = {};
+      return;
     }
 
-    removeIfEmptyData(element);
+    if (expandoStore.handle) {
+      if (expandoStore.events.$destroy) {
+        expandoStore.handle({}, '$destroy');
+      }
+      jqLiteOff(element);
+    }
+    delete jqCache[expandoId];
+    element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
   }
 }
 
@@ -634,7 +615,6 @@ forEach({
   cleanData: function jqLiteCleanData(nodes) {
     for (var i = 0, ii = nodes.length; i < ii; i++) {
       jqLiteRemoveData(nodes[i]);
-      jqLiteOff(nodes[i]);
     }
   }
 }, function(fn, name) {

src/loader.js

@@ -328,8 +328,7 @@ function setupModuleLoader(window) {
            * @ngdoc method
            * @name angular.Module#component
            * @module ng
-           * @param {string|Object} name Name of the component in camelCase (i.e. `myComp` which will match `<my-comp>`),
-           *    or an object map of components where the keys are the names and the values are the component definition objects.
+           * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp)
            * @param {Object} options Component definition object (a simplified
            *    {@link ng.$compile#directive-definition-object directive definition object})
            *

src/minErr.js

@@ -7,8 +7,7 @@
 */
 
 var minErrConfig = {
-  objectMaxDepth: 5,
-  urlErrorParamsEnabled: true
+  objectMaxDepth: 5
 };
 
 /**
@@ -31,21 +30,12 @@ var minErrConfig = {
  * * `objectMaxDepth`  **{Number}** - The max depth for stringifying objects. Setting to a
  *   non-positive or non-numeric value, removes the max depth limit.
  *   Default: 5
- *
- * * `urlErrorParamsEnabled`  **{Boolean}** - Specifies wether the generated error url will
- *   contain the parameters of the thrown error. Disabling the parameters can be useful if the
- *   generated error url is very long.
- *
- *   Default: true. When used without argument, it returns the current value.
  */
 function errorHandlingConfig(config) {
   if (isObject(config)) {
     if (isDefined(config.objectMaxDepth)) {
       minErrConfig.objectMaxDepth = isValidObjectMaxDepth(config.objectMaxDepth) ? config.objectMaxDepth : NaN;
     }
-    if (isDefined(config.urlErrorParamsEnabled) && isBoolean(config.urlErrorParamsEnabled)) {
-      minErrConfig.urlErrorParamsEnabled = config.urlErrorParamsEnabled;
-    }
   } else {
     return minErrConfig;
   }
@@ -60,7 +50,6 @@ function isValidObjectMaxDepth(maxDepth) {
   return isNumber(maxDepth) && maxDepth > 0;
 }
 
-
 /**
  * @description
  *
@@ -93,11 +82,6 @@ function isValidObjectMaxDepth(maxDepth) {
 
 function minErr(module, ErrorConstructor) {
   ErrorConstructor = ErrorConstructor || Error;
-
-  var url = 'https://errors.angularjs.org/"NG_VERSION_FULL"/';
-  var regex = url.replace('.', '\\.') + '[\\s\\S]*';
-  var errRegExp = new RegExp(regex, 'g');
-
   return function() {
     var code = arguments[0],
       template = arguments[1],
@@ -107,27 +91,21 @@ function minErr(module, ErrorConstructor) {
       }),
       paramPrefix, i;
 
-    // A minErr message has two parts: the message itself and the url that contains the
-    // encoded message.
-    // The message's parameters can contain other error messages which also include error urls.
-    // To prevent the messages from getting too long, we strip the error urls from the parameters.
-
     message += template.replace(/\{\d+\}/g, function(match) {
       var index = +match.slice(1, -1);
 
       if (index < templateArgs.length) {
-        return templateArgs[index].replace(errRegExp, '');
+        return templateArgs[index];
       }
 
       return match;
     });
 
-    message += '\n' + url + (module ? module + '/' : '') + code;
+    message += '\nhttp://errors.angularjs.org/"NG_VERSION_FULL"/' +
+      (module ? module + '/' : '') + code;
 
-    if (minErrConfig.urlErrorParamsEnabled) {
-      for (i = 0, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
-        message += paramPrefix + 'p' + i + '=' + encodeURIComponent(templateArgs[i]);
-      }
+    for (i = 0, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
+      message += paramPrefix + 'p' + i + '=' + encodeURIComponent(templateArgs[i]);
     }
 
     return new ErrorConstructor(message);

src/ng/animate.js

@@ -464,77 +464,13 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        * @ngdoc method
        * @name $animate#cancel
        * @kind function
-       * @description Cancels the provided animation and applies the end state of the animation.
-       * Note that this does not cancel the underlying operation, e.g. the setting of classes or
-       * adding the element to the DOM.
+       * @description Cancels the provided animation.
        *
-       * @param {animationRunner} animationRunner An animation runner returned by an $animate function.
-       *
-       * @example
-        <example module="animationExample" deps="angular-animate.js" animations="true" name="animate-cancel">
-          <file name="app.js">
-            angular.module('animationExample', ['ngAnimate']).component('cancelExample', {
-              templateUrl: 'template.html',
-              controller: function($element, $animate) {
-                this.runner = null;
-
-                this.addClass = function() {
-                  this.runner = $animate.addClass($element.find('div'), 'red');
-                  var ctrl = this;
-                  this.runner.finally(function() {
-                    ctrl.runner = null;
-                  });
-                };
-
-                this.removeClass = function() {
-                  this.runner = $animate.removeClass($element.find('div'), 'red');
-                  var ctrl = this;
-                  this.runner.finally(function() {
-                    ctrl.runner = null;
-                  });
-                };
-
-                this.cancel = function() {
-                  $animate.cancel(this.runner);
-                };
-              }
-            });
-          </file>
-          <file name="template.html">
-            <p>
-              <button id="add" ng-click="$ctrl.addClass()">Add</button>
-              <button ng-click="$ctrl.removeClass()">Remove</button>
-              <br>
-              <button id="cancel" ng-click="$ctrl.cancel()" ng-disabled="!$ctrl.runner">Cancel</button>
-              <br>
-              <div id="target">CSS-Animated Text</div>
-            </p>
-          </file>
-          <file name="index.html">
-            <cancel-example></cancel-example>
-          </file>
-          <file name="style.css">
-            .red-add, .red-remove {
-              transition: all 4s cubic-bezier(0.250, 0.460, 0.450, 0.940);
-            }
-
-            .red,
-            .red-add.red-add-active {
-              color: #FF0000;
-              font-size: 40px;
-            }
-
-            .red-remove.red-remove-active {
-              font-size: 10px;
-              color: black;
-            }
-
-          </file>
-        </example>
+       * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
        */
       cancel: function(runner) {
-        if (runner.cancel) {
-          runner.cancel();
+        if (runner.end) {
+          runner.end();
         }
       },
 
@@ -560,7 +496,7 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
        *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
        *
-       * @return {Runner} the animation runner
+       * @return {Promise} the animation callback promise
        */
       enter: function(element, parent, after, options) {
         parent = parent && jqLite(parent);
@@ -592,7 +528,7 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
        *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
        *
-       * @return {Runner} the animation runner
+       * @return {Promise} the animation callback promise
        */
       move: function(element, parent, after, options) {
         parent = parent && jqLite(parent);
@@ -619,7 +555,7 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
        *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
        *
-       * @return {Runner} the animation runner
+       * @return {Promise} the animation callback promise
        */
       leave: function(element, options) {
         return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
@@ -649,7 +585,7 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
        *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
        *
-       * @return {Runner} animationRunner the animation runner
+       * @return {Promise} the animation callback promise
        */
       addClass: function(element, className, options) {
         options = prepareAnimateOptions(options);
@@ -679,7 +615,7 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
        *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
        *
-       * @return {Runner} the animation runner
+       * @return {Promise} the animation callback promise
        */
       removeClass: function(element, className, options) {
         options = prepareAnimateOptions(options);
@@ -710,7 +646,7 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
        *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
        *
-       * @return {Runner} the animation runner
+       * @return {Promise} the animation callback promise
        */
       setClass: function(element, add, remove, options) {
         options = prepareAnimateOptions(options);
@@ -757,7 +693,7 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
        *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
        *
-       * @return {Runner} the animation runner
+       * @return {Promise} the animation callback promise
        */
       animate: function(element, from, to, className, options) {
         options = prepareAnimateOptions(options);

src/ng/browser.js

@@ -172,7 +172,8 @@ function Browser(window, document, $log, $sniffer) {
       // - pendingLocation is needed as browsers don't allow to read out
       //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
       //   https://openradar.appspot.com/22186109).
-      return pendingLocation || location.href;
+      // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
+      return pendingLocation || location.href.replace(/%27/g,'\'');
     }
   };
 

src/ng/compile.js

@@ -303,22 +303,21 @@
  *   name. Given `<my-component my-attr="parentModel">` and the isolate scope definition `scope: {
  *   localModel: '=myAttr' }`, the property `localModel` on the directive's scope will reflect the
  *   value of `parentModel` on the parent scope. Changes to `parentModel` will be reflected in
- *   `localModel` and vice versa. If the binding expression is non-assignable, or if the attribute
- *   isn't  optional and doesn't exist, an exception
- *   ({@link error/$compile/nonassign `$compile:nonassign`}) will be thrown upon discovering changes
- *   to the local value, since it will be impossible to sync them back to the parent scope.
- *
- *   By default, the {@link ng.$rootScope.Scope#$watch `$watch`}
+ *   `localModel` and vice versa. Optional attributes should be marked as such with a question mark:
+ *   `=?` or `=?attr`. If the binding expression is non-assignable, or if the attribute isn't
+ *   optional and doesn't exist, an exception ({@link error/$compile/nonassign `$compile:nonassign`})
+ *   will be thrown upon discovering changes to the local value, since it will be impossible to sync
+ *   them back to the parent scope. By default, the {@link ng.$rootScope.Scope#$watch `$watch`}
  *   method is used for tracking changes, and the equality check is based on object identity.
  *   However, if an object literal or an array literal is passed as the binding expression, the
  *   equality check is done by value (using the {@link angular.equals} function). It's also possible
  *   to watch the evaluated value shallowly with {@link ng.$rootScope.Scope#$watchCollection
- *   `$watchCollection`}: use `=*` or `=*attr`
+ *   `$watchCollection`}: use `=*` or `=*attr` (`=*?` or `=*?attr` if the attribute is optional).
  *
   * * `<` or `<attr` - set up a one-way (one-directional) binding between a local scope property and an
  *   expression passed via the attribute `attr`. The expression is evaluated in the context of the
  *   parent scope. If no `attr` name is specified then the attribute name is assumed to be the same as the
- *   local name.
+ *   local name. You can also make the binding optional by adding `?`: `<?` or `<?attr`.
  *
  *   For example, given `<my-component my-attr="parentModel">` and directive definition of
  *   `scope: { localModel:'<myAttr' }`, then the isolated scope property `localModel` will reflect the
@@ -339,11 +338,6 @@
  *   One-way binding is useful if you do not plan to propagate changes to your isolated scope bindings
  *   back to the parent. However, it does not make this completely impossible.
  *
- *   By default, the {@link ng.$rootScope.Scope#$watch `$watch`}
- *   method is used for tracking changes, and the equality check is based on object identity.
- *   It's also possible to watch the evaluated value shallowly with
- *   {@link ng.$rootScope.Scope#$watchCollection `$watchCollection`}: use `<*` or `<*attr`
- *
  * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope. If
  *   no `attr` name is specified then the attribute name is assumed to be the same as the local name.
  *   Given `<my-component my-attr="count = count + value">` and the isolate scope definition `scope: {
@@ -353,36 +347,6 @@
  *   and values into the expression wrapper fn. For example, if the expression is `increment(amount)`
  *   then we can specify the amount value by calling the `localFn` as `localFn({amount: 22})`.
  *
- * All 4 kinds of bindings (`@`, `=`, `<`, and `&`) can be made optional by adding `?` to the expression.
- * The marker must come after the mode and before the attribute name.
- * See the {@link error/$compile/iscp Invalid Isolate Scope Definition error} for definition examples.
- * This is useful to refine the interface directives provide.
- * One subtle difference between optional and non-optional happens **when the binding attribute is not
- * set**:
- * - the binding is optional: the property will not be defined
- * - the binding is not optional: the property is defined
- *
- * ```js
- *app.directive('testDir', function() {
-    return {
-      scope: {
-        notoptional: '=',
-        optional: '=?',
-      },
-      bindToController: true,
-      controller: function() {
-        this.$onInit = function() {
-          console.log(this.hasOwnProperty('notoptional')) // true
-          console.log(this.hasOwnProperty('optional')) // false
-        }
-      }
-    }
-  })
- *```
- *
- *
- * ##### Combining directives with different scope defintions
- *
  * In general it's possible to apply more than one directive to one element, but there might be limitations
  * depending on the type of scope required by the directives. The following points will help explain these limitations.
  * For simplicity only two directives are taken into account, but it is also applicable for several directives:
@@ -410,6 +374,12 @@
  * `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings
  * initialized.
  *
+ * <div class="alert alert-warning">
+ * **Deprecation warning:** if `$compileProcvider.preAssignBindingsEnabled(true)` was called, bindings for non-ES6 class
+ * controllers are bound to `this` before the controller constructor is called but this use is now deprecated. Please
+ * place initialization code that relies upon bindings inside a `$onInit` method on the controller, instead.
+ * </div>
+ *
  * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property.
  * This will set up the scope bindings to the controller directly. Note that `scope` can still be used
  * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate
@@ -536,10 +506,9 @@
  * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
  *
  *
- * #### `replace`
- * <div class="alert alert-danger">
- * **Note:** `replace` is deprecated in AngularJS and has been removed in the new Angular (v2+).
- * </div>
+ * #### `replace` (*DEPRECATED*)
+ *
+ * `replace` will be removed in next major release - i.e. v2.0).
  *
  * Specifies what the template should replace. Defaults to `false`.
  *
@@ -989,59 +958,6 @@
    compiled again. This is an undesired effect and can lead to misbehaving directives, performance issues,
    and memory leaks. Refer to the Compiler Guide {@link guide/compiler#double-compilation-and-how-to-avoid-it
    section on double compilation} for an in-depth explanation and ways to avoid it.
-
- * @knownIssue
-
-   ### Issues with `replace: true`
- *
- * <div class="alert alert-danger">
- *   **Note**: {@link $compile#-replace- `replace: true`} is deprecated and not recommended to use,
- *   mainly due to the issues listed here. It has been completely removed in the new Angular.
- * </div>
- *
- * #### Attribute values are not merged
- *
- * When a `replace` directive encounters the same attribute on the original and the replace node,
- * it will simply deduplicate the attribute and join the values with a space or with a `;` in case of
- * the `style` attribute.
- * ```html
- * Original Node: <span class="original" style="color: red;"></span>
- * Replace Template: <span class="replaced" style="background: blue;"></span>
- * Result: <span class="original replaced" style="color: red; background: blue;"></span>
- * ```
- *
- * That means attributes that contain AngularJS expressions will not be merged correctly, e.g.
- * {@link ngShow} or {@link ngClass} will cause a {@link $parse} error:
- *
- * ```html
- * Original Node: <span ng-class="{'something': something}" ng-show="!condition"></span>
- * Replace Template: <span ng-class="{'else': else}" ng-show="otherCondition"></span>
- * Result: <span ng-class="{'something': something} {'else': else}" ng-show="!condition otherCondition"></span>
- * ```
- *
- * See issue [#5695](https://github.com/angular/angular.js/issues/5695).
- *
- * #### Directives are not deduplicated before compilation
- *
- * When the original node and the replace template declare the same directive(s), they will be
- * {@link guide/compiler#double-compilation-and-how-to-avoid-it compiled twice} because the compiler
- * does not deduplicate them. In many cases, this is not noticable, but e.g. {@link ngModel} will
- * attach `$formatters` and `$parsers` twice.
- *
- * See issue [#2573](https://github.com/angular/angular.js/issues/2573).
- *
- * #### `transclude: element` in the replace template root can have
- * unexpected effects
- *
- * When the replace template has a directive at the root node that uses
- * {@link $compile#-transclude- `transclude: element`}, e.g.
- * {@link ngIf} or {@link ngRepeat}, the DOM structure or scope inheritance can be incorrect.
- * See the following issues:
- *
- * - Incorrect scope on replaced element:
- * [#9837](https://github.com/angular/angular.js/issues/9837)
- * - Different DOM between `template` and `templateUrl`:
- * [#10612](https://github.com/angular/angular.js/issues/14326)
  *
  */
 
@@ -1073,13 +989,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
   var bindingCache = createMap();
 
   function parseIsolateBindings(scope, directiveName, isController) {
-    var LOCAL_REGEXP = /^([@&]|[=<](\*?))(\??)\s*([\w$]*)$/;
+    var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/;
 
     var bindings = createMap();
 
     forEach(scope, function(definition, scopeName) {
-      definition = definition.trim();
-
       if (definition in bindingCache) {
         bindings[scopeName] = bindingCache[definition];
         return;
@@ -1474,21 +1388,54 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
   /**
    * @ngdoc method
-   * @name  $compileProvider#strictComponentBindingsEnabled
+   * @name  $compileProvider#preAssignBindingsEnabled
    *
-   * @param {boolean=} enabled update the strictComponentBindingsEnabled state if provided,
-   * otherwise return the current strictComponentBindingsEnabled state.
+   * @param {boolean=} enabled update the preAssignBindingsEnabled state if provided, otherwise just return the
+   * current preAssignBindingsEnabled state
    * @returns {*} current value if used as getter or itself (chaining) if used as setter
    *
    * @kind function
    *
    * @description
-   * Call this method to enable / disable the strict component bindings check. If enabled, the
-   * compiler will enforce that all scope / controller bindings of a
-   * {@link $compileProvider#directive directive} / {@link $compileProvider#component component}
-   * that are not set as optional with `?`, must be provided when the directive is instantiated.
-   * If not provided, the compiler will throw the
-   * {@link error/$compile/missingattr $compile:missingattr error}.
+   * Call this method to enable/disable whether directive controllers are assigned bindings before
+   * calling the controller's constructor.
+   * If enabled (true), the compiler assigns the value of each of the bindings to the
+   * properties of the controller object before the constructor of this object is called.
+   *
+   * If disabled (false), the compiler calls the constructor first before assigning bindings.
+   *
+   * The default value is false.
+   *
+   * @deprecated
+   * sinceVersion="1.6.0"
+   * removeVersion="1.7.0"
+   *
+   * This method and the option to assign the bindings before calling the controller's constructor
+   * will be removed in v1.7.0.
+   */
+  var preAssignBindingsEnabled = false;
+  this.preAssignBindingsEnabled = function(enabled) {
+    if (isDefined(enabled)) {
+      preAssignBindingsEnabled = enabled;
+      return this;
+    }
+    return preAssignBindingsEnabled;
+  };
+
+  /**
+   * @ngdoc method
+   * @name  $compileProvider#strictComponentBindingsEnabled
+   *
+   * @param {boolean=} enabled update the strictComponentBindingsEnabled state if provided, otherwise just return the
+   * current strictComponentBindingsEnabled state
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
+   *
+   * @kind function
+   *
+   * @description
+   * Call this method to enable/disable strict component bindings check. If enabled, the compiler will enforce that
+   * for all bindings of a component that are not set as optional with `?`, an attribute needs to be provided
+   * on the component's HTML tag.
    *
    * The default value is false.
    */
@@ -1589,9 +1536,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
   this.$get = [
             '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse',
-            '$controller', '$rootScope', '$sce', '$animate',
+            '$controller', '$rootScope', '$sce', '$animate', '$$sanitizeUri',
     function($injector,   $interpolate,   $exceptionHandler,   $templateRequest,   $parse,
-             $controller,   $rootScope,   $sce,   $animate) {
+             $controller,   $rootScope,   $sce,   $animate,   $$sanitizeUri) {
 
     var SIMPLE_ATTR_NAME = /^\w/;
     var specialAttrHolder = window.document.createElement('div');
@@ -1616,15 +1563,19 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         }
         // We must run this hook in an apply since the $$postDigest runs outside apply
         $rootScope.$apply(function() {
+          var errors = [];
           for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
             try {
               onChangesQueue[i]();
             } catch (e) {
-              $exceptionHandler(e);
+              errors.push(e);
             }
           }
           // Reset the queue to trigger a new schedule next time there is a change
           onChangesQueue = undefined;
+          if (errors.length) {
+            throw errors;
+          }
         });
       } finally {
         onChangesTtl++;
@@ -1736,8 +1687,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
        */
       $set: function(key, value, writeAttr, attrName) {
         // TODO: decide whether or not to throw an error if "class"
-        // is set through this function since it may cause $updateClass to
-        // become unstable.
+        //is set through this function since it may cause $updateClass to
+        //become unstable.
 
         var node = this.$$element[0],
             booleanKey = getBooleanAttrName(node, key),
@@ -1767,20 +1718,12 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
         nodeName = nodeName_(this.$$element);
 
-        // Sanitize img[srcset] values.
-        if (nodeName === 'img' && key === 'srcset' && value) {
-          if (!isString(value)) {
-            throw $compileMinErr('srcset', 'Can\'t pass trusted values to `$set(\'srcset\', value)`: "{0}"', value.toString());
-          }
-
-          // Such values are a bit too complex to handle automatically inside $sce.
-          // Instead, we sanitize each of the URIs individually, which works, even dynamically.
-
-          // It's not possible to work around this using `$sce.trustAsMediaUrl`.
-          // If you want to programmatically set explicitly trusted unsafe URLs, you should use
-          // `$sce.trustAsHtml` on the whole `img` tag and inject it into the DOM using the
-          // `ng-bind-html` directive.
-
+        if ((nodeName === 'a' && (key === 'href' || key === 'xlinkHref')) ||
+            (nodeName === 'img' && key === 'src')) {
+          // sanitize a[href] and img[src] values
+          this[key] = value = $$sanitizeUri(value, key === 'src');
+        } else if (nodeName === 'img' && key === 'srcset' && isDefined(value)) {
+          // sanitize img[srcset] values
           var result = '';
 
           // first check if there are spaces because it's not the same pattern
@@ -1797,16 +1740,16 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           for (var i = 0; i < nbrUrisWith2parts; i++) {
             var innerIdx = i * 2;
             // sanitize the uri
-            result += $sce.getTrustedMediaUrl(trim(rawUris[innerIdx]));
+            result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
             // add the descriptor
-            result += ' ' + trim(rawUris[innerIdx + 1]);
+            result += (' ' + trim(rawUris[innerIdx + 1]));
           }
 
           // split the last item into uri and descriptor
           var lastTuple = trim(rawUris[i * 2]).split(/\s/);
 
           // sanitize the last uri
-          result += $sce.getTrustedMediaUrl(trim(lastTuple[0]));
+          result += $$sanitizeUri(trim(lastTuple[0]), true);
 
           // and add the last descriptor if any
           if (lastTuple.length === 2) {
@@ -2000,7 +1943,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           // for call to the link function.
           // Note: This will already clone the nodes...
           $linkNode = jqLite(
-            wrapTemplate(namespace, jqLite('<div></div>').append($compileNodes).html())
+            wrapTemplate(namespace, jqLite('<div>').append($compileNodes).html())
           );
         } else if (cloneConnectFn) {
           // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
@@ -2554,6 +2497,17 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
             compileNode = $compileNode[0];
             replaceWith(jqCollection, sliceArgs($template), compileNode);
 
+            // Support: Chrome < 50
+            // https://github.com/angular/angular.js/issues/14041
+
+            // In the versions of V8 prior to Chrome 50, the document fragment that is created
+            // in the `replaceWith` function is improperly garbage collected despite still
+            // being referenced by the `parentNode` property of all of the child nodes.  By adding
+            // a reference to the fragment via a different property, we can avoid that incorrect
+            // behavior.
+            // TODO: remove this line after Chrome 50 has been released
+            $template[0].$$parentNode = $template[0].parentNode;
+
             childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, terminalPriority,
                                         replaceDirective && replaceDirective.name, {
                                           // Don't pass in:
@@ -2575,7 +2529,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
               // We have transclusion slots,
               // collect them up, compile them and store their transclusion functions
-              $template = window.document.createDocumentFragment();
+              $template = [];
 
               var slotMap = createMap();
               var filledSlots = createMap();
@@ -2603,10 +2557,10 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                 var slotName = slotMap[directiveNormalize(nodeName_(node))];
                 if (slotName) {
                   filledSlots[slotName] = true;
-                  slots[slotName] = slots[slotName] || window.document.createDocumentFragment();
-                  slots[slotName].appendChild(node);
+                  slots[slotName] = slots[slotName] || [];
+                  slots[slotName].push(node);
                 } else {
-                  $template.appendChild(node);
+                  $template.push(node);
                 }
               });
 
@@ -2620,11 +2574,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
               for (var slotName in slots) {
                 if (slots[slotName]) {
                   // Only define a transclusion function if the slot was filled
-                  slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName].childNodes, transcludeFn);
+                  slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName], transcludeFn);
                 }
               }
-
-              $template = $template.childNodes;
             }
 
             $compileNode.empty(); // clear contents
@@ -2815,11 +2767,33 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           var controller = elementControllers[name];
           var bindings = controllerDirective.$$bindings.bindToController;
 
-          controller.instance = controller();
-          $element.data('$' + controllerDirective.name + 'Controller', controller.instance);
-          controller.bindingInfo =
-            initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+          if (preAssignBindingsEnabled) {
+            if (bindings) {
+              controller.bindingInfo =
+                initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+            } else {
+              controller.bindingInfo = {};
+            }
+
+            var controllerResult = controller();
+            if (controllerResult !== controller.instance) {
+              // If the controller constructor has a return value, overwrite the instance
+              // from setupControllers
+              controller.instance = controllerResult;
+              $element.data('$' + controllerDirective.name + 'Controller', controllerResult);
+              if (controller.bindingInfo.removeWatches) {
+                controller.bindingInfo.removeWatches();
+              }
+              controller.bindingInfo =
+                initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+            }
+          } else {
+            controller.instance = controller();
+            $element.data('$' + controllerDirective.name + 'Controller', controller.instance);
+            controller.bindingInfo =
+              initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
           }
+        }
 
         // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy
         forEach(controllerDirectives, function(controllerDirective, name) {
@@ -3323,30 +3297,18 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       }
       var tag = nodeName_(node);
       // All tags with src attributes require a RESOURCE_URL value, except for
-      // img and various html5 media tags, which require the MEDIA_URL context.
+      // img and various html5 media tags.
       if (attrNormalizedName === 'src' || attrNormalizedName === 'ngSrc') {
         if (['img', 'video', 'audio', 'source', 'track'].indexOf(tag) === -1) {
           return $sce.RESOURCE_URL;
         }
-        return $sce.MEDIA_URL;
-      } else if (attrNormalizedName === 'xlinkHref') {
-        // Some xlink:href are okay, most aren't
-        if (tag === 'image') return $sce.MEDIA_URL;
-        if (tag === 'a') return $sce.URL;
-        return $sce.RESOURCE_URL;
-      } else if (
-          // Formaction
+      // maction[xlink:href] can source SVG.  It's not limited to <maction>.
+      } else if (attrNormalizedName === 'xlinkHref' ||
           (tag === 'form' && attrNormalizedName === 'action') ||
-          // If relative URLs can go where they are not expected to, then
-          // all sorts of trust issues can arise.
-          (tag === 'base' && attrNormalizedName === 'href') ||
           // links can be stylesheets or imports, which can run script in the current origin
           (tag === 'link' && attrNormalizedName === 'href')
       ) {
         return $sce.RESOURCE_URL;
-      } else if (tag === 'a' && (attrNormalizedName === 'href' ||
-                                 attrNormalizedName === 'ngHref')) {
-        return $sce.URL;
       }
     }
 
@@ -3617,21 +3579,21 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
             if (optional && !attrs[attrName]) break;
 
             parentGet = $parse(attrs[attrName]);
-            var isLiteral = parentGet.literal;
+            var deepWatch = parentGet.literal;
 
             var initialValue = destination[scopeName] = parentGet(scope);
             initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
 
-            removeWatch = scope[definition.collection ? '$watchCollection' : '$watch'](parentGet, function parentValueWatchAction(newValue, oldValue) {
+            removeWatch = scope.$watch(parentGet, function parentValueWatchAction(newValue, oldValue) {
               if (oldValue === newValue) {
-                if (oldValue === initialValue || (isLiteral && equals(oldValue, initialValue))) {
+                if (oldValue === initialValue || (deepWatch && equals(oldValue, initialValue))) {
                   return;
                 }
                 oldValue = initialValue;
               }
               recordChanges(scopeName, newValue, oldValue);
               destination[scopeName] = newValue;
-            });
+            }, deepWatch);
 
             removeWatchCollection.push(removeWatch);
             break;

src/ng/controller.js

@@ -26,7 +26,8 @@ function identifierForController(controller, ident) {
  * {@link ng.$controllerProvider#register register} method.
  */
 function $ControllerProvider() {
-  var controllers = {};
+  var controllers = {},
+      globals = false;
 
   /**
    * @ngdoc method
@@ -54,7 +55,22 @@ function $ControllerProvider() {
     }
   };
 
-  this.$get = ['$injector', function($injector) {
+  /**
+   * @ngdoc method
+   * @name $controllerProvider#allowGlobals
+   * @description If called, allows `$controller` to find controller constructors on `window`
+   *
+   * @deprecated
+   * sinceVersion="v1.3.0"
+   * removeVersion="v1.7.0"
+   * This method of finding controllers has been deprecated.
+   */
+  this.allowGlobals = function() {
+    globals = true;
+  };
+
+
+  this.$get = ['$injector', '$window', function($injector, $window) {
 
     /**
      * @ngdoc service
@@ -67,6 +83,8 @@ function $ControllerProvider() {
      *
      *    * check if a controller with given name is registered via `$controllerProvider`
      *    * check if evaluating the string on the current scope returns a constructor
+     *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
+     *      `window` object (deprecated, not recommended)
      *
      *    The string can use the `controller as property` syntax, where the controller instance is published
      *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
@@ -106,7 +124,8 @@ function $ControllerProvider() {
         identifier = identifier || match[3];
         expression = controllers.hasOwnProperty(constructor)
             ? controllers[constructor]
-            : getter(locals.$scope, constructor, true);
+            : getter(locals.$scope, constructor, true) ||
+                (globals ? getter($window, constructor, true) : undefined);
 
         if (!expression) {
           throw $controllerMinErr('ctrlreg',

src/ng/directive/attrs.js

@@ -436,7 +436,7 @@ forEach(['src', 'srcset', 'href'], function(attrName) {
           // On IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
           // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
           // to set the property as well to achieve the desired effect.
-          // We use attr[attrName] value since $set might have sanitized the url.
+          // We use attr[attrName] value since $set can sanitize the url.
           if (msie && propName) element.prop(propName, attr[name]);
         });
       }

src/ng/directive/form.js

@@ -9,8 +9,7 @@ var nullFormCtrl = {
   $setValidity: noop,
   $setDirty: noop,
   $setPristine: noop,
-  $setSubmitted: noop,
-  $$setSubmitted: noop
+  $setSubmitted: noop
 },
 PENDING_CLASS = 'ng-pending',
 SUBMITTED_CLASS = 'ng-submitted';
@@ -275,25 +274,12 @@ FormController.prototype = {
    * @name form.FormController#$setSubmitted
    *
    * @description
-   * Sets the form to its `$submitted` state. This will also set `$submitted` on all child and
-   * parent forms of the form.
+   * Sets the form to its submitted state.
    */
   $setSubmitted: function() {
-    var rootForm = this;
-    while (rootForm.$$parentForm && (rootForm.$$parentForm !== nullFormCtrl)) {
-      rootForm = rootForm.$$parentForm;
-    }
-    rootForm.$$setSubmitted();
-  },
-
-  $$setSubmitted: function() {
     this.$$animate.addClass(this.$$element, SUBMITTED_CLASS);
     this.$submitted = true;
-    forEach(this.$$controls, function(control) {
-      if (control.$$setSubmitted) {
-        control.$$setSubmitted();
-      }
-    });
+    this.$$parentForm.$setSubmitted();
   }
 };
 
@@ -352,21 +338,16 @@ addSetValidityMethod({
  * @restrict EAC
  *
  * @description
- * Helper directive that makes it possible to create control groups inside a
- * {@link ng.directive:form `form`} directive.
- * These "child forms" can be used, for example, to determine the validity of a sub-group of
- * controls.
+ * Nestable alias of {@link ng.directive:form `form`} directive. HTML
+ * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
+ * sub-group of controls needs to be determined.
  *
- * <div class="alert alert-danger">
- * **Note**: `ngForm` cannot be used as a replacement for `<form>`, because it lacks its
- * [built-in HTML functionality](https://html.spec.whatwg.org/#the-form-element).
- * Specifically, you cannot submit `ngForm` like a `<form>` tag. That means,
- * you cannot send data to the server with `ngForm`, or integrate it with
- * {@link ng.directive:ngSubmit `ngSubmit`}.
- * </div>
+ * Note: the purpose of `ngForm` is to group controls,
+ * but not to be a replacement for the `<form>` tag with all of its capabilities
+ * (e.g. posting to the server, ...).
  *
- * @param {string=} ngForm|name Name of the form. If specified, the form controller will
- *                              be published into the related scope, under this name.
+ * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
+ *                       related scope, under this name.
  *
  */