chore(protractor): update jasmine-reporters and switch to jasmine2

This commit also adds a new capability to the protractor configs that
ensures that all angularjs.org tests run correctly on Firefox. See
https://github.com/SeleniumHQ/selenium/issues/1202

.github/ISSUE_TEMPLATE.md

@@ -1,27 +0,0 @@
-***Note*: for support questions, please use one of these channels: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#question. This repository's issues are reserved for feature requests and bug reports.**
-
-**Do you want to request a *feature* or report a *bug*?**
-
-
-
-**What is the current behavior?**
-
-
-
-**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://plnkr.co or similar (template: http://plnkr.co/edit/tpl:yBpEi4).**
-
-
-
-**What is the expected behavior?**
-
-
-
-**What is the motivation / use case for changing the behavior?**
-
-
-
-**Which versions of Angular, and which browser / OS are affected by this issue? Did this work in previous versions of Angular? Please also test with the latest stable and snapshot (https://code.angularjs.org/snapshot/) versions.**
-
-
-
-**Other information (e.g. stacktraces, related issues, suggestions how to fix)**

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +0,0 @@
-**What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)**
-
-
-
-**What is the current behavior? (You can also link to an open issue here)**
-
-
-
-**What is the new behavior (if this is a feature change)?**
-
-
-
-**Does this PR introduce a breaking change?**
-
-
-
-**Please check if the PR fulfills these requirements**
-- [ ] The commit message follows our guidelines: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit-message-format
-- [ ] Tests for the changes have been added (for bug fixes / features)
-- [ ] Docs have been added / updated (for bug fixes / features)
-
-**Other information**:
-

.jshintrc-base

@@ -1,24 +1,19 @@
 {
   "bitwise": true,
-  "esversion": 6,
   "immed": true,
   "newcap": true,
   "noarg": true,
   "noempty": true,
   "nonew": true,
+  "trailing": true,
   "maxlen": 200,
   "boss": true,
   "eqnull": true,
   "expr": true,
+  "globalstrict": true,
   "laxbreak": true,
   "loopfunc": true,
-  "strict": "global",
   "sub": true,
   "undef": true,
-  "indent": 2,
-
-  "globals": {
-    "ArrayBuffer": false,
-    "Uint8Array": false
-  }
+  "indent": 2
 }

.travis.yml

@@ -62,7 +62,6 @@ notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/d2120f3f2bb39a4531b2
-      - http://104.197.9.155:8484/hubot/travis/activity #hubot-server
-    on_success: always  # options: [always|never|change] default: always
+    on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: always    # default: false
+    on_start: false     # default: false

CONTRIBUTING.md

@@ -193,8 +193,6 @@ We have very precise rules over how our git commit messages can be formatted.  T
 readable messages** that are easy to follow when looking through the **project history**.  But also,
 we use the git commit messages to **generate the AngularJS change log**.
 
-The commit message formatting can be added using a typical git workflow or through the use of a CLI wizard ([Commitizen](https://github.com/commitizen/cz-cli)). To use the wizard, run `npm run commit` in your terminal after staging your changes in git.
-
 ### Commit Message Format
 Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
 format that includes a **type**, a **scope** and a **subject**:

Gruntfile.js

@@ -135,9 +135,6 @@ module.exports = function(grunt) {
       ngMock: {
         files: { src: 'src/ngMock/**/*.js' },
       },
-      ngParseExt: {
-        files: { src: 'src/ngParseExt/**/*.js' },
-      },
       ngResource: {
         files: { src: 'src/ngResource/**/*.js' },
       },
@@ -234,11 +231,7 @@ module.exports = function(grunt) {
         dest: 'build/angular-aria.js',
         src: util.wrap(files['angularModules']['ngAria'], 'module')
       },
-      parseext: {
-        dest: 'build/angular-parse-ext.js',
-        src: util.wrap(files['angularModules']['ngParseExt'], 'module')
-      },
-      "promises-aplus-adapter": {
+      'promises-aplus-adapter': {
         dest:'tmp/promises-aplus-adapter++.js',
         src:['src/ng/q.js', 'lib/promises-aplus/promises-aplus-test-adapter.js']
       }
@@ -256,8 +249,7 @@ module.exports = function(grunt) {
       resource: 'build/angular-resource.js',
       route: 'build/angular-route.js',
       sanitize: 'build/angular-sanitize.js',
-      aria: 'build/angular-aria.js',
-      parseext: 'build/angular-parse-ext.js'
+      aria: 'build/angular-aria.js'
     },
 
 
@@ -272,17 +264,12 @@ module.exports = function(grunt) {
       ],
       options: {
         disallowed: [
-          'fit',
           'iit',
           'xit',
-          'fthey',
           'tthey',
           'xthey',
-          'fdescribe',
           'ddescribe',
-          'xdescribe',
-          'it.only',
-          'describe.only'
+          'xdescribe'
         ]
       }
     },
@@ -327,7 +314,7 @@ module.exports = function(grunt) {
           stderr: true,
           failOnError: true
         },
-        command: path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js')
+        command: path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js --timeout 2000')
       }
     },
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2016 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,26 +8,25 @@ synchronizes data from your UI (view) with your JavaScript objects (model) throu
 binding. To help you structure your application better and make it easy to test, AngularJS teaches
 the browser how to do dependency injection and inversion of control.
 
-It also helps with server-side communication, taming async callbacks with promises and deferreds,
-and it makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
-piece of cake. Best of all? It makes development fun!
+Oh yeah and it helps with server-side communication, taming async callbacks with promises and 
+deferreds. It also makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
+piece of cake. Best of all?? It makes development fun!
 
-* Web site: https://angularjs.org
-* Tutorial: https://docs.angularjs.org/tutorial
-* API Docs: https://docs.angularjs.org/api
-* Developer Guide: https://docs.angularjs.org/guide
+* Web site: http://angularjs.org
+* Tutorial: http://docs.angularjs.org/tutorial
+* API Docs: http://docs.angularjs.org/api
+* Developer Guide: http://docs.angularjs.org/guide
 * Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
-* Dashboard: https://dashboard.angularjs.org
-
-
+* Dashboard: http://dashboard.angularjs.org
+ 
 Building AngularJS
 ---------
-[Once you have set up your environment](https://docs.angularjs.org/misc/contribute), just run:
+[Once you have your environment set up](http://docs.angularjs.org/misc/contribute) just run:
 
     grunt package
 
 
-Running tests
+Running Tests
 -------------
 To execute all unit tests, use:
 
@@ -38,22 +37,18 @@ To execute end-to-end (e2e) tests, use:
     grunt package
     grunt test:e2e
 
-To learn more about the grunt tasks, run `grunt --help`
-
-Contribute & Develop
---------------------
-
-We've set up a separate document for our [contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
+To learn more about the grunt tasks, run `grunt --help` and also read our
+[contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
 
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)
 
-What to use AngularJS for and when to use it
+What to Use AngularJS for and When to Use it
 ---------
 AngularJS is the next generation framework where each component is designed to work with every other component in an interconnected way like a well-oiled machine. AngularJS is JavaScript MVC made easy and done right. (Well it is not really MVC, read on, to understand what this means.)
 
 #### MVC, no, MV* done the right way!
-MVC, short for Model-View-Controller, is a design pattern, i.e. how the code should be organized and how the different parts of an application separated for proper readability and debugging. Model is the data and the database. View is the user interface and what the user sees. Controller is the main link between Model and View. These are the three pillars of major programming frameworks present on the market today. On the other hand AngularJS works on MV*, short for Model-View-_Whatever_. The _Whatever_ is AngularJS's way of telling that you may create any kind of linking between the Model and the View here.
+MVC, short for Model-View-Controller, is a design pattern, i.e. how the code should be organized and how the different parts of an application separated for proper readability and debugging. Model is the data and the database. View is the user interface and what the user sees. Controller is the main link between Model and View. These are the three pillars of major programming frameworks present on the market today. On the other hand AngularJS works on MV*, short for Model-View-_Whatever_. The _Whatever_ is AngularJS's way of telling that you may create any kind of linking between the Model and the View here. 
 
 Unlike other frameworks in any programming language, where MVC, the three separate components, each one has to be written and then connected by the programmer, AngularJS helps the programmer by asking him/her to just create these and everything else will be taken care of by AngularJS.
 
@@ -66,8 +61,8 @@ Data and Data Models in AngularJS are plain JavaScript objects and one can add a
 #### Two-way Data Binding
 One of AngularJS's strongest features. Two-way Data Binding means that if something changes in the Model, the change gets reflected in the View instantaneously, and the same happens the other way around. This is also referred to as Reactive Programming, i.e. suppose `a = b + c` is being programmed and after this, if the value of `b` and/or `c` is changed then the value of `a` will be automatically updated to reflect the change. AngularJS uses its "scopes" as a glue between the Model and View and makes these updates in one available for the other.
 
-#### Less Written Code and Easily Maintainable Code
-Everything in AngularJS is created to enable the programmer to end up writing less code that is easily maintainable and readable by any other new person on the team. Believe it or not, one can write a complete working two-way data binded application in less than 10 lines of code. Try and see for yourself!
+#### Less Written Code and Easily Maintable Code
+Everything in AngularJS is created to enable the programmer ends up writing less code that is easily maintainable and readable by any other new person on the team. Believe it or not, one can write a complete working two-way data binded application in less than 10 lines of code. Try and see for yourself!
 
 #### Testing Ready
 AngularJS has Dependency Injection, i.e. it takes care of providing all the necessary dependencies to its controllers whenever required. This helps in making the AngularJS code ready for unit testing by making use of mock dependencies created and injected. This makes AngularJS more modular and easily testable thus in turn helping a team create more robust applications.

TRIAGING.md

@@ -20,7 +20,7 @@ The following is done automatically so you don't have to worry about it:
 This process based on the idea of minimizing user pain
 [from this blog post](http://www.lostgarden.com/2008/05/improving-bug-triage-with-user-pain.html).
 
-1. Open the list of [non triaged issues](https://github.com/angular/angular.js/issues?q=is%3Aopen+sort%3Acreated-desc+no%3Amilestone)
+1. Open the list of [non triaged issues](https://github.com/angular/angular.js/issues?direction=desc&milestone=none&page=1&sort=created&state=open)
     * Sort by submit date, with the newest issues first
     * You don't have to do issues in order; feel free to pick and choose issues as you please.
     * You can triage older issues as well

angularFiles.js

@@ -102,7 +102,6 @@ var angularFiles = {
       'src/ngAnimate/animateJsDriver.js',
       'src/ngAnimate/animateQueue.js',
       'src/ngAnimate/animation.js',
-      'src/ngAnimate/ngAnimateSwap.js',
       'src/ngAnimate/module.js'
     ],
     'ngCookies': [
@@ -120,10 +119,6 @@ var angularFiles = {
     'ngMessages': [
       'src/ngMessages/messages.js'
     ],
-    'ngParseExt': [
-      'src/ngParseExt/ucd.js',
-      'src/ngParseExt/module.js'
-    ],
     'ngResource': [
       'src/ngResource/resource.js'
     ],
@@ -209,7 +204,6 @@ var angularFiles = {
   "karmaModules": [
     'build/angular.js',
     '@angularSrcModules',
-    'test/modules/no_bootstrap.js',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
     'test/ngMessageFormat/*.js',

benchmarks/largetable-bp/main.html

@@ -8,20 +8,20 @@
       Large table rendered with AngularJS
       </p>
 
-      <div><label><input type="radio" ng-model="benchmarkType" value="none">none: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="baselineBinding">baseline binding: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="baselineInterpolation">baseline interpolation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBind">ngBind: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBindOnce">ngBindOnce: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolation">interpolation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="bindOnceInterpolation">interpolation + bind-once: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolationAttr">attribute interpolation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBindFn">ngBind + fnInvocation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolationFn">interpolation + fnInvocation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBindFilter">ngBind + filter: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolationFilter">interpolation + filter: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngModelConstName">ngModel (const name): </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngModelInterpName">ngModel (interp name): </label></div>
+      <div>none: <input type="radio" ng-model="benchmarkType" value="none"></div>
+      <div>baseline binding: <input type="radio" ng-model="benchmarkType" value="baselineBinding"></div>
+      <div>baseline interpolation: <input type="radio" ng-model="benchmarkType" value="baselineInterpolation"></div>
+      <div>ngBind: <input type="radio" ng-model="benchmarkType" value="ngBind"></div>
+      <div>ngBindOnce: <input type="radio" ng-model="benchmarkType" value="ngBindOnce"></div>
+      <div>interpolation: <input type="radio" ng-model="benchmarkType" value="interpolation"></div>
+      <div>interpolation + bind-once: <input type="radio" ng-model="benchmarkType" value="bindOnceInterpolation"></div>
+      <div>attribute interpolation: <input type="radio" ng-model="benchmarkType" value="interpolationAttr"></div>
+      <div>ngBind + fnInvocation: <input type="radio" ng-model="benchmarkType" value="ngBindFn"></div>
+      <div>interpolation + fnInvocation: <input type="radio" ng-model="benchmarkType" value="interpolationFn"></div>
+      <div>ngBind + filter: <input type="radio" ng-model="benchmarkType" value="ngBindFilter"></div>
+      <div>interpolation + filter: <input type="radio" ng-model="benchmarkType" value="interpolationFilter"></div>
+      <div>ngModel (const name): <input type="radio" ng-model="benchmarkType" value="ngModelConstName"></div>
+      <div>ngModel (interp name): <input type="radio" ng-model="benchmarkType" value="ngModelInterpName"></div>
 
       <ng-switch on="benchmarkType">
         <baseline-binding-table ng-switch-when="baselineBinding">

docs/app/assets/css/docs.css

@@ -315,13 +315,8 @@ iframe.example {
   color:white;
 }
 
-.search-results-group .search-results {
-  padding: 0 5px 0;
-  list-style-type: none;
-}
-
 .search-results-frame > .search-results-group:first-child > .search-results {
-  border-right:1px solid #222;
+  border-right:1px solid #050505;
 }
 
 .search-results-group.col-group-api { width:30%; }
@@ -330,57 +325,10 @@ iframe.example {
 .search-results-group.col-group-misc,
 .search-results-group.col-group-error { width:15%; float: right; }
 
-@supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-  .search-results-group.col-group-api .search-results {
-    -moz-column-count: 2;
-    -ms-column-count: 2;
-    -webkit-column-count: 2;
-    column-count: 2;
-    /* Prevent bullets in the second column from being hidden in Chrome and IE */
-    -webkit-column-gap: 2em;
-    -ms-column-gap: 2em;
-    column-gap: 2em;
-  }
-}
-
-.search-results-group .search-result {
-  word-wrap: break-word;
-  -webkit-hyphens: auto;
-  -moz-hyphens: auto;
-  -ms-hyphens: auto;
-  hyphens: auto;
-  -ms-column-break-inside: avoid;
-  -webkit-column-break-inside: avoid;
-  -moz-column-break-inside: avoid; /* Unsupported */
-  column-break-inside: avoid;
-  text-indent: -0.65em;  /* Make sure line wrapped words are aligned vertically */
-}
-
-@supports (-moz-column-count: 2) {
-  .search-results-group .search-result {
-    /* Prevents column breaks inside words in FF, but has adverse effects in IE11 and Chrome */
-    overflow: hidden;
-    padding-left: 1em; /* In FF the list item bullet is otherwise  hidden */
-    margin-left: -1em; /* offset the padding left */
-  }
-}
-
-.search-result:before {
-  content: "\002D\00A0"; /* Dash and non-breaking space as List item type */
-  position: relative;
-}
 
 .search-results-group.col-group-api .search-result {
   width:48%;
   display:inline-block;
-  padding-left: 12px;
-}
-
-@supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-  .search-results-group.col-group-api .search-result {
-    width:auto;
-    display: list-item;
-  }
 }
 
 .search-close {
@@ -740,11 +688,6 @@ ul.events > li {
     padding-bottom:60px;
     text-align:left;
   }
-
-  .search-results-frame > .search-results-group:first-child > .search-results {
-    border-right: none;
-  }
-
   .search-results-group {
     float:none!important;
     display:block!important;
@@ -752,42 +695,14 @@ ul.events > li {
     border:0!important;
     padding:0!important;
   }
-
-  @supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-    .search-results-group .search-results {
-      -moz-column-count: 2;
-      -ms-column-count: 2;
-      -webkit-column-count: 2;
-      column-count: 2;
-    }
-  }
-
   .search-results-group .search-result {
     display:inline-block!important;
     padding:0 5px;
     width:auto!important;
-    text-indent: initial;
-    margin-left: 0;
   }
-
   .search-results-group .search-result:after {
     content:", ";
   }
-
-  .search-results-group .search-result:before {
-    content: "";
-  }
-
-  @supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-    .search-results-group .search-result {
-      display: list-item !important;
-    }
-
-    .search-results-group .search-result:after {
-      content: "";
-    }
-  }
-
   #wrapper {
     padding-bottom:0px;
   }

docs/app/assets/js/search-worker.js

@@ -3,7 +3,7 @@
 /* global importScripts, onmessage: true, postMessage, lunr */
 
 // Load up the lunr library
-importScripts('../components/lunr.js-0.5.12/lunr.min.js');
+importScripts('../components/lunr.js-0.4.2/lunr.min.js');
 
 // Create the lunr index - the docs should be an array of object, each object containing
 // the path and search terms for a page

docs/app/e2e/.jshintrc

@@ -19,12 +19,9 @@
     "dump": false,
 
     /* e2e */
-    "protractor": false,
     "browser": false,
     "element": false,
     "by": false,
-    "$": false,
-    "$$": false,
 
     /* testabilityPatch / matchers */
     "inject": false,
@@ -42,4 +39,4 @@
     "browserTrigger": false,
     "jqLiteCacheSize": false
   }
-}
+}

docs/app/src/docs.js

@@ -1,11 +1,13 @@
 angular.module('DocsController', [])
 
 .controller('DocsController', [
-          '$scope', '$rootScope', '$location', '$window', '$cookies',
+          '$scope', '$rootScope', '$location', '$window', '$cookies', 'openPlunkr',
               'NG_PAGES', 'NG_NAVIGATION', 'NG_VERSION',
-  function($scope, $rootScope, $location, $window, $cookies,
+  function($scope, $rootScope, $location, $window, $cookies, openPlunkr,
               NG_PAGES, NG_NAVIGATION, NG_VERSION) {
 
+  $scope.openPlunkr = openPlunkr;
+
   $scope.docsVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.version;
 
   $scope.navClass = function(navItem) {

docs/app/src/examples.js

@@ -72,110 +72,29 @@ angular.module('examples', [])
   };
 }])
 
-.factory('createCopyrightNotice', function() {
-    var COPYRIGHT = 'Copyright ' + (new Date()).getFullYear() + ' Google Inc. All Rights Reserved.\n'
-     + 'Use of this source code is governed by an MIT-style license that\n'
-     + 'can be found in the LICENSE file at http://angular.io/license';
-    var COPYRIGHT_JS_CSS = '\n\n/*\n' + COPYRIGHT + '\n*/';
-    var COPYRIGHT_HTML = '\n\n<!-- \n' + COPYRIGHT + '\n-->';
 
-    return function getCopyright(filename) {
-      switch (filename.substr(filename.lastIndexOf('.'))) {
-        case '.html':
-          return COPYRIGHT_HTML;
-        case '.js':
-        case '.css':
-          return COPYRIGHT_JS_CSS;
-        case '.md':
-          return COPYRIGHT;
-      }
-      return '';
-    };
-})
+.factory('openPlunkr', ['formPostData', '$http', '$q', function(formPostData, $http, $q) {
+  return function(exampleFolder, clickEvent) {
 
-.directive('plnkrOpener', ['$q', 'getExampleData', 'formPostData', 'createCopyrightNotice', function($q, getExampleData, formPostData, createCopyrightNotice) {
-  return {
-    scope: {},
-    bindToController: {
-      'examplePath': '@'
-    },
-    controllerAs: 'plnkr',
-    template: '<button ng-click="plnkr.open($event)" class="btn pull-right"> <i class="glyphicon glyphicon-edit">&nbsp;</i> Edit in Plunker</button> ',
-    controller: [function() {
-      var ctrl = this;
+    var exampleName = 'AngularJS Example';
+    var newWindow = clickEvent.ctrlKey || clickEvent.metaKey;
 
-      ctrl.example = {
-        path: ctrl.examplePath,
-        manifest: undefined,
-        files: undefined,
-        name: 'AngularJS Example'
-      };
-
-      ctrl.prepareExampleData = function() {
-        if (ctrl.example.manifest) {
-          return $q.when(ctrl.example);
-        }
-
-        return getExampleData(ctrl.examplePath).then(function(data) {
-          ctrl.example.files = data.files;
-          ctrl.example.manifest = data.manifest;
-
-          // Build a pretty title for the Plunkr
-          var exampleNameParts = data.manifest.name.split('-');
-          exampleNameParts.unshift('AngularJS');
-          angular.forEach(exampleNameParts, function(part, index) {
-            exampleNameParts[index] = part.charAt(0).toUpperCase() + part.substr(1);
-          });
-          ctrl.example.name = exampleNameParts.join(' - ');
-
-          return ctrl.example;
-        });
-      };
-
-      ctrl.open = function(clickEvent) {
-
-        var newWindow = clickEvent.ctrlKey || clickEvent.metaKey;
-
-        var postData = {
-          'tags[0]': "angularjs",
-          'tags[1]': "example",
-          'private': true
-        };
-
-        // Make sure the example data is available.
-        // If an XHR must be made, this might break some pop-up blockers when
-        // new window is requested
-        ctrl.prepareExampleData()
-          .then(function() {
-            angular.forEach(ctrl.example.files, function(file) {
-              postData['files[' + file.name + ']'] = file.content + createCopyrightNotice(file.name);
-            });
-
-            postData.description = ctrl.example.name;
-
-            formPostData('http://plnkr.co/edit/?p=preview', newWindow, postData);
-          });
-
-      };
-
-      // Initialize the example data, so it's ready when clicking the open button.
-      // Otherwise pop-up blockers will prevent a new window from opening
-      ctrl.prepareExampleData(ctrl.example.path);
-
-    }]
-  };
-}])
-
-.factory('getExampleData', ['$http', '$q', function($http, $q) {
-  return function(exampleFolder){
     // Load the manifest for the example
-    return $http.get(exampleFolder + '/manifest.json')
+    $http.get(exampleFolder + '/manifest.json')
       .then(function(response) {
         return response.data;
       })
       .then(function(manifest) {
         var filePromises = [];
 
+        // Build a pretty title for the Plunkr
+        var exampleNameParts = manifest.name.split('-');
+        exampleNameParts.unshift('AngularJS');
+        angular.forEach(exampleNameParts, function(part, index) {
+          exampleNameParts[index] = part.charAt(0).toUpperCase() + part.substr(1);
+        });
+        exampleName = exampleNameParts.join(' - ');
+
         angular.forEach(manifest.files, function(filename) {
           filePromises.push($http.get(exampleFolder + '/' + filename, { transformResponse: [] })
             .then(function(response) {
@@ -183,7 +102,7 @@ angular.module('examples', [])
               // The manifests provide the production index file but Plunkr wants
               // a straight index.html
               if (filename === "index-production.html") {
-                filename = "index.html";
+                filename = "index.html"
               }
 
               return {
@@ -192,11 +111,21 @@ angular.module('examples', [])
               };
             }));
         });
+        return $q.all(filePromises);
+      })
+      .then(function(files) {
+        var postData = {};
 
-        return $q.all({
-          manifest: manifest,
-          files: $q.all(filePromises)
+        angular.forEach(files, function(file) {
+          postData['files[' + file.name + ']'] = file.content;
         });
+
+        postData['tags[0]'] = "angularjs";
+        postData['tags[1]'] = "example";
+        postData.private = true;
+        postData.description = exampleName;
+
+        formPostData('http://plnkr.co/edit/?p=preview', newWindow, postData);
       });
   };
-}]);
+}]);

docs/app/src/search.js

@@ -11,15 +11,7 @@ angular.module('search', [])
     var MIN_SEARCH_LENGTH = 2;
     if(q.length >= MIN_SEARCH_LENGTH) {
       docsSearch(q).then(function(hits) {
-        // Make sure the areas are always in the same order
-        var results = {
-          api: [],
-          guide: [],
-          tutorial: [],
-          error: [],
-          misc: []
-        };
-
+        var results = {};
         angular.forEach(hits, function(hit) {
           var area = hit.area;
 

docs/app/src/tutorials.js

@@ -11,8 +11,7 @@ angular.module('tutorials', [])
     scope: {},
     template:
       '<a ng-href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
-      '<a ng-href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
-      '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
+      '<a ng-href="https://github.com/angular/angular-phonecat/compare/1.4-step-{{diffLo}}...1.4-step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
       '<a ng-href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>',
     link: function(scope, element, attrs) {
       var seq = 1 * attrs.docTutorialNav;
@@ -38,12 +37,11 @@ angular.module('tutorials', [])
       '<p><button class="btn" ng-click="show=!show">Workspace Reset Instructions  ➤</button></p>\n' +
       '<div class="alert alert-info" ng-show="show">\n' +
       '  <p>Reset the workspace to step {{step}}.</p>' +
-      '  <p><pre>git checkout -f step-{{step}}</pre></p>\n' +
-      '  <p>Refresh your browser or check out this step online: '+
-          '<a href="http://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
+      '  <p><pre>git checkout -f 1.4-step-{{step}}</pre></p>\n' +
+      '  <p>Refresh your browser to see the changes.</p>\n' +
       '</div>\n' +
       '<p>The most important changes are listed below. You can see the full diff on ' +
-        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}" title="See diff on Github">GitHub</a>\n' +
+        '<a ng-href="https://github.com/angular/angular-phonecat/compare/1.4-step-{{step ? (step - 1) : \'0~1\'}}...1.4-step-{{step}}" title="See diff on Github">GitHub</a>\n' +
       '</p>'
   };
-});
+});

docs/app/test/docsSpec.js

@@ -3,6 +3,7 @@ describe("DocsController", function() {
 
   angular.module('fake', [])
     .value('$cookies', {})
+    .value('openPlunkr', function() {})
     .value('NG_PAGES', {})
     .value('NG_NAVIGATION', {})
     .value('NG_VERSION', {});
@@ -25,7 +26,7 @@ describe("DocsController", function() {
 
     it("should update the Google Analytics with $location.path if currentPage is missing", inject(function($window, $location) {
       $window._gaq = [];
-      spyOn($location, 'path').and.returnValue('x/y/z');
+      spyOn($location, 'path').andReturn('x/y/z');
       $scope.$broadcast('$includeContentLoaded');
       expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']);
     }));

docs/app/test/errorsSpec.js

@@ -4,7 +4,7 @@ describe('errors', function() {
   // Mock `ngSanitize` module
   angular.
     module('ngSanitize', []).
-    value('$sanitize', jasmine.createSpy('$sanitize').and.callFake(angular.identity));
+    value('$sanitize', jasmine.createSpy('$sanitize').andCallFake(angular.identity));
 
   beforeEach(module('errors'));
 
@@ -103,12 +103,12 @@ describe('errors', function() {
 
 
     it('should pass the final string through `$sanitize`', function() {
-      $sanitize.calls.reset();
+      $sanitize.reset();
 
       var input = 'start https://foo/bar?baz#qux end';
       var output = errorLinkFilter(input);
 
-      expect($sanitize).toHaveBeenCalledTimes(1);
+      expect($sanitize.callCount).toBe(1);
       expect($sanitize).toHaveBeenCalledWith(output);
     });
   });
@@ -123,7 +123,7 @@ describe('errors', function() {
     beforeEach(module(function($provide) {
       $provide.decorator('errorLinkFilter', function() {
         errorLinkFilter = jasmine.createSpy('errorLinkFilter');
-        errorLinkFilter.and.callFake(angular.identity);
+        errorLinkFilter.andCallFake(angular.identity);
 
         return errorLinkFilter;
       });
@@ -142,7 +142,7 @@ describe('errors', function() {
 
 
     it('should interpolate the contents against `$location.search()`', function() {
-      spyOn($location, 'search').and.returnValue({p0: 'foo', p1: 'bar'});
+      spyOn($location, 'search').andReturn({p0: 'foo', p1: 'bar'});
 
       var elem = $compile('<span error-display="foo = {0}, bar = {1}"></span>')($rootScope);
       expect(elem.html()).toBe('foo = foo, bar = bar');
@@ -150,10 +150,10 @@ describe('errors', function() {
 
 
     it('should pass the interpolated text through `errorLinkFilter`', function() {
-      $location.search = jasmine.createSpy('search').and.returnValue({p0: 'foo'});
+      $location.search = jasmine.createSpy('search').andReturn({p0: 'foo'});
 
       var elem = $compile('<span error-display="foo = {0}"></span>')($rootScope);
-      expect(errorLinkFilter).toHaveBeenCalledTimes(1);
+      expect(errorLinkFilter.callCount).toBe(1);
       expect(errorLinkFilter).toHaveBeenCalledWith('foo = foo', '_blank');
     });
 

docs/bower.json

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

docs/config/index.js

@@ -54,7 +54,6 @@ module.exports = new Package('angularjs', [
 .config(function(parseTagsProcessor) {
   parseTagsProcessor.tagDefinitions.push(require('./tag-defs/tutorial-step'));
   parseTagsProcessor.tagDefinitions.push(require('./tag-defs/sortOrder'));
-  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/installation'));
 })
 
 

docs/config/tag-defs/installation.js

@@ -1,3 +0,0 @@
-module.exports = {
-  name: 'installation'
-};

docs/config/templates/api/module.template.html

@@ -1,92 +0,0 @@
-{% extends "base.template.html" %}
-
-{% block content %}
-<h1>
-  {% if doc.title %}{$ doc.title | marked $}{% else %}{$ doc.name | code $}{% endif %}
-</h1>
-
-{% if doc.installation or doc.installation == '' %}
-  {$ doc.installation | marked $}
-{% else %}
-  <h2>Installation</h2>
-
-  <p>First include {$ doc.packageFile | code $} in your HTML:</p>
-
-  {% code %}
-      <script src="angular.js">
-      <script src="{$ doc.packageFile $}">
-  {% endcode %}
-
-  <p>You can download this file from the following places:</p>
-  <ul>
-    <li>
-      <a href="https://developers.google.com/speed/libraries/devguide#angularjs">Google CDN</a><br>
-      e.g. {$ ("//ajax.googleapis.com/ajax/libs/angularjs/X.Y.Z/" + doc.packageFile) | code $}
-    </li>
-    <li>
-      <a href="http://bower.io">Bower</a><br>
-      e.g. {% code %}bower install {$ doc.packageName $}@X.Y.Z{% endcode %}
-    </li>
-    <li>
-      <a href="http://code.angularjs.org/">code.angularjs.org</a><br>
-      e.g. {% code %}"//code.angularjs.org/X.Y.Z/{$ doc.packageFile $}"{% endcode %}
-    </li>
-  </ul>
-  <p>where X.Y.Z is the AngularJS version you are running.</p>
-  <p>Then load the module in your application by adding it as a dependent module:</p>
-  {% code %}
-    angular.module('app', ['{$ doc.name $}']);
-  {% endcode %}
-
-  <p>With that you&apos;re ready to get started!</p>
-{% endif %}
-
-{$ doc.description | marked $}
-
-{% if doc.knownIssueDocs %}
-<div class="known-issues">
-  <h2 id="known-issues">Known Issues</h2>
-  <table class="definition-table">
-  <tr><th>Name</th><th>Description</th></tr>
-  {% for issueDoc in doc.knownIssueDocs -%}
-  <tr>
-    <td>{$ issueDoc.id | link(issueDoc.name, issueDoc) $}</td>
-    <td>
-    {% for issue in issueDoc.knownIssues -%}
-      {$ issue | marked $}
-    {% endfor -%}
-    </td>
-  </tr>
-  {% endfor -%}
-  </table>
-</div>
-{% endif %}
-
-
-<div class="component-breakdown">
-  <h2>Module Components</h2>
-  {% for componentGroup in doc.componentGroups %}
-  <div>
-    <h3 class="component-heading" id="{$ componentGroup.groupType | dashCase $}">{$ componentGroup.groupType | title $}</h3>
-    <table class="definition-table">
-      <tr>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-      {% for component in componentGroup.components %}
-      <tr>
-        <td>{$ component.id | link(component.name, component) $}</td>
-        <td>{$ component.description | firstParagraph | marked $}</td>
-      </tr>
-      {% endfor %}
-    </table>
-  </div>
-  {% endfor %}
-</div>
-
-{% if doc.usage %}
-  <h2>Usage</h2>
-  {$ doc.usage | marked $}
-{% endif %}
-
-{% endblock %}

docs/config/templates/indexPage.template.html

@@ -147,13 +147,13 @@
         <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">
+              <div ng-repeat="(key, value) in results" class="search-results-group" ng-class="colClassName + ' col-group-' + key">
                 <h4 class="search-results-group-heading">{{ key }}</h4>
-                <ul class="search-results">
-                  <!-- Do not insert a line break between li and a. Chrome will insert an actual line-break, which breaks the list item view.
-                  TODO: use a html minifier instead -->
-                  <li ng-repeat="item in value" class="search-result"><a ng-click="hideResults()" ng-href="{{ item.path }}">{{ item.name }}</a></li>
-                </ul>
+                <div class="search-results">
+                  <div ng-repeat="item in value" class="search-result">
+                    - <a ng-click="hideResults()" ng-href="{{ item.path }}">{{ item.name }}</a>
+                  </div>
+                </div>
               </div>
             </div>
             <a href="" ng-click="hideResults()" class="search-close">
@@ -220,7 +220,7 @@
         <p class="pull-right"><a back-to-top>Back to top</a></p>
 
         <p>
-          Super-powered by Google  ©2010-2016
+          Super-powered by Google  ©2010-2015
           ( <a id="version"
                ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
                ng-bind-template="v{{version}}" title="Changelog of this version of Angular JS">

docs/config/templates/runnableExample.template.html

@@ -2,7 +2,9 @@
    is HTML and wrap each line in a <p> - thus breaking the HTML #}
 
 <div>
-  <plnkr-opener example-path="{$ doc.path $}"></plnkr-opener>
+  <a ng-click="openPlunkr('{$ doc.path $}', $event)" class="btn pull-right">
+    <i class="glyphicon glyphicon-edit">&nbsp;</i>
+    Edit in Plunker</a>
 
   <div class="runnable-example"
       path="{$ doc.example.deployments.default.path $}"

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

@@ -1,8 +1,8 @@
 @ngdoc error
 @name $compile:baddir
-@fullName Invalid Directive/Component Name
+@fullName Invalid Directive Name
 @description
 
-This error occurs when the name of a directive or component is not valid.
+This error occurs when the name of a directive is not valid.
 
-Directives and Components must start with a lowercase character and must not contain leading or trailing whitespaces.
+Directives must start with a lowercase character and must not contain leading or trailing whitespaces.

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

@@ -1,30 +0,0 @@
-@ngdoc error
-@name $compile:infchng
-@fullName Unstable `$onChanges` hooks
-@description
-
-This error occurs when the application's model becomes unstable because some `$onChanges` hooks are causing updates which then trigger
-further calls to `$onChanges` that can never complete.
-Angular detects this situation and prevents an infinite loop from causing the browser to become unresponsive.
-
-For example, the situation can occur by setting up a `$onChanges()` hook which triggers an event on the component, which subsequently
-triggers the component's bound inputs to be updated:
-
-```html
-<c1 prop="a" on-change="a = -a"></c1>
-```
-
-```js
-function Controller1() {}
-Controller1.$onChanges = function() {
-  this.onChange();
-};
-
-mod.component('c1', {
-  controller: Controller1,
-  bindings: {'prop': '<', onChange: '&'}
-}
-```
-
-The maximum number of allowed iterations of the `$onChanges` hooks is controlled via TTL setting which can be configured via
-{@link ng.$compileProvider#onChangesTtl `$compileProvider.onChangesTtl`}.

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

@@ -3,7 +3,7 @@
 @fullName Invalid Isolate Scope Definition
 @description
 
-When declaring isolate scope the scope definition object must be in specific format which starts with mode character (`@&=<`), after which comes an optional `?`, and it ends with an optional local name.
+When declaring isolate scope the scope definition object must be in specific format which starts with mode character (`@&=`) with an optional local name.
 
 ```
 myModule.directive('directiveName', function factory() {
@@ -12,7 +12,7 @@ myModule.directive('directiveName', function factory() {
     scope: {
       'attrName': '@', // OK
       'attrName2': '=localName', // OK
-      'attrName3': '<?localName', // OK
+      'attrName3': '&?localName', // OK
       'attrName4': ' = name', // OK
       'attrName5': 'name',    // ERROR: missing mode @&=
       'attrName6': 'name=',   // ERROR: must be prefixed with @&=

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

@@ -31,7 +31,7 @@ single root element, like the `div` element in this template:
 <div><b>Hello</b> World!</div>
 ```
 
-An invalid template to be used with this directive is one that defines multiple root nodes or
+An an invalid template to be used with this directive is one that defines multiple root nodes or
 elements. For example:
 
 ```
@@ -43,7 +43,7 @@ well.  Consider the following template:
 
 ```
 <div class='container'>
-  <div class='wrapper'>
+  <div class='wrapper>
      ...
   </div> <!-- wrapper -->
 </div> <!-- container -->

docs/content/error/$location/nobase.ngdoc

@@ -1,6 +1,6 @@
 @ngdoc error
 @name $location:nobase
-@fullName $location in HTML5 mode requires a <base> tag to be present!
+@fullName $location in HTML5 mode requires a `<base>` tag to be present!
 @description
 
 If you configure {@link ng.$location `$location`} to use

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

@@ -14,32 +14,3 @@ perform this check - it's up to the developer to not expose such sensitive and p
 directly on the scope chain.
 
 To resolve this error, avoid Window access.
-
-### Common CoffeeScript Issue
-
-Be aware that if you are using CoffeeScript, it automatically returns the value of the last statement in a
-function. So for instance
-
-```coffeescript
-  scope.foo = ->
-    window.open 'https://example.com'
-```
-
-compiles to something like
-
-```js
-  scope.foo = function() {
-    return window.open('https://example.com');
-  };
-```
-
-You can see that this function will return the result of calling `window.open`, which is a `Window`
-object.
-
-You can avoid this by explicitly returning something else from the function:
-
-```coffeescript
-  scope.foo = ->
-    window.open 'https://example.com'
-    return true;
-```

docs/content/error/$sanitize/badparse.ngdoc

@@ -0,0 +1,11 @@
+@ngdoc error
+@name $sanitize:badparse
+@fullName Parsing Error while Sanitizing
+@description
+
+This error occurs when the HTML string passed to '$sanitize' can't be parsed by the sanitizer.
+The error contains part of the html string that can't be parsed.
+
+The parser is more strict than a typical browser parser, so it's possible that some obscure input would produce this error despite the string being recognized as valid HTML by a browser.
+
+If a valid html code results in this error, please file a bug.

docs/content/error/$sanitize/noinert.ngdoc

@@ -1,10 +0,0 @@
-@ngdoc error
-@name $sanitize:noinert
-@fullName Can't create an inert html document
-@description
-
-This error occurs when `$sanitize` sanitizer determines that `document.implementation.createHTMLDocument ` api is not supported by the current browser.
-
-This api is necessary for safe parsing of HTML strings into DOM trees and without it the sanitizer can't sanitize the input.
-
-The api is present in all supported browsers including IE 9.0, so the presence of this error usually indicates that Angular's `$sanitize` is being used on an unsupported platform.

docs/content/error/$sanitize/uinput.ngdoc

@@ -1,13 +0,0 @@
-@ngdoc error
-@name $sanitize:uinput
-@fullName Failed to sanitize html because the input is unstable
-@description
-
-This error occurs when `$sanitize` sanitizer tries to check the input for possible mXSS payload and the verification
-errors due to the input mutating indefinitely. This could be a sign that the payload contains code exploiting an mXSS
-vulnerability in the browser.
-
-mXSS attack exploit browser bugs that cause some browsers parse a certain html strings into DOM, which once serialized
-doesn't match the original input. These browser bugs can be exploited by attackers to create payload which looks
-harmless to sanitizers, but due to mutations caused by the browser are turned into dangerous code once processed after
-sanitization.

docs/content/error/linky/notstring.ngdoc

@@ -1,16 +0,0 @@
-@ngdoc error
-@name linky:notstring
-@fullName Not a string
-@description
-
-This error occurs when {@link ngSanitize.linky linky} is used with a non-empty, non-string value:
-```html
-<div ng-bind-html="42 | linky"></div>
-```
-
-`linky` is supposed to be used with string values only, and therefore assumes that several methods
-(such as `.match()`) are available on the passed in value.
-The value can be initialized asynchronously and therefore null or undefined won't throw this error.
-
-If you want to pass non-string values to `linky` (e.g. Objects whose `.toString()` should be
-utilized), you need to manually convert them to strings.

docs/content/error/orderBy/notarray.ngdoc

@@ -1,52 +0,0 @@
-@ngdoc error
-@name orderBy:notarray
-@fullName Value is not array-like
-@description
-
-This error occurs when {@link ng.orderBy orderBy} is not passed an array-like value:
-```html
-<div ng-repeat="(key, value) in myObj | orderBy:someProp">
-  {{ key }} : {{ value }}
-</div>
-```
-
-`orderBy` must be used with an array-like value so a subset of items can be returned.
-The array can be initialized asynchronously and therefore `null` or `undefined` won't throw this error.
-
-To use `orderBy` to order the properties of an object, you can create your own array based on that object:
-```js
-angular.module('aModule', [])
-  .controller('aController', function($scope) {
-    var myObj = {
-      one: {id: 1, name: 'Some thing'},
-      two: {id: 2, name: 'Another thing'},
-      three: {id: 3, name: 'A third thing'}
-    };
-
-    $scope.arrFromMyObj = Object.keys(myObj).map(function(key) {
-      return myObj[key];
-    });
-  });
-```
-That can be used as:
-```html
-<label>
-  Order by:
-  <select ng-model="orderProp" ng-options="prop for prop in ['id', 'name']"></select>
-</label>
-<div ng-repeat="item in arrFromMyObj | orderBy:orderProp">
-  [{{ item.id }}] {{ item.name }}
-</div>
-```
-
-You could as well convert the object to an array using a filter such as
-[toArrayFilter](https://github.com/petebacondarwin/angular-toArrayFilter):
-```html
-<label>
-  Order by:
-  <select ng-model="orderProp" ng-options="prop for prop in ['id', 'name']"></select>
-</label>
-<div ng-repeat="item in myObj | toArray:false | orderBy:orderProp">
-  [{{ item.id }}] {{ item.name }}
-</div>
-```

docs/content/guide/$location.ngdoc

@@ -350,7 +350,7 @@ base and the path that should be handled by the application.
 ### Base href constraints
 
 The `$location` service is not able to function properly if the current URL is outside the URL given
-as the base href. This can have subtle confusing consequencies...
+as the base href. This can have subtle confusing consequences...
 
 Consider a base href set as follows: `<base href="/base/">` (i.e. the application exists in the "folder"
 called `/base`). The URL `/base` is actually outside the application (it refers to the `base` file found

docs/content/guide/accessibility.ngdoc

@@ -10,7 +10,7 @@ The goal of ngAria is to improve Angular's default accessibility by enabling com
 [ARIA](http://www.w3.org/TR/wai-aria/) attributes that convey state or semantic information for
 assistive technologies used by persons with disabilities.
 
-## Including ngAria
+##Including ngAria
 
 Using {@link ngAria ngAria} is as simple as requiring the ngAria module in your application. ngAria hooks into
 standard AngularJS directives and quietly injects accessibility support into your application
@@ -20,7 +20,7 @@ at runtime.
 angular.module('myApp', ['ngAria'])...
 ```
 
-### Using ngAria
+###Using ngAria
 Most of what ngAria does is only visible "under the hood". To see the module in action, once you've
 added it as a dependency, you can test a few things:
  * Using your favorite element inspector, look for attributes added by ngAria in your own code.
@@ -28,15 +28,11 @@ added it as a dependency, you can test a few things:
  * Fire up a screen reader such as VoiceOver or NVDA to check for ARIA support.
 [Helpful screen reader tips.](http://webaim.org/articles/screenreader_testing/)
 
-## Supported directives
+##Supported directives
 Currently, ngAria interfaces with the following directives:
 
  * {@link guide/accessibility#ngmodel ngModel}
  * {@link guide/accessibility#ngdisabled ngDisabled}
- * {@link guide/accessibility#ngrequired ngRequired}
- * {@link guide/accessibility#ngreadonly ngReadonly}
- * {@link guide/accessibility#ngvaluechecked ngChecked}
- * {@link guide/accessibility#ngvaluechecked ngValue}
  * {@link guide/accessibility#ngshow ngShow}
  * {@link guide/accessibility#nghide ngHide}
  * {@link guide/accessibility#ngclick ngClick}
@@ -45,7 +41,7 @@ Currently, ngAria interfaces with the following directives:
 
 <h2 id="ngmodel">ngModel</h2>
 
-Much of ngAria's heavy lifting happens in the {@link ng.ngModel ngModel}
+Much of ngAria's heavy lifting happens in the {@link ng.directive:ngModel ngModel}
 directive. For elements using ngModel, special attention is paid by ngAria if that element also
 has a role or type of `checkbox`, `radio`, `range` or `textbox`.
 
@@ -58,62 +54,12 @@ attributes (if they have not been explicitly specified by the developer):
  * aria-valuenow
  * aria-invalid
  * aria-required
- * aria-readonly
 
-### Example
+###Example
 
 <example module="ngAria_ngModelExample" deps="angular-aria.js">
-  <file name="index.html">
-    <form ng-controller="formsController">
-      <some-checkbox role="checkbox" ng-model="checked" ng-class="{active: checked}"
-        ng-disabled="isDisabled" ng-click="toggleCheckbox()"
-        aria-label="Custom Checkbox" show-attrs>
-        <span class="icon" aria-hidden="true"></span>
-        Custom Checkbox
-      </some-checkbox>
-    </form>
-  </file>
-  <file name="script.js">
-    var app = angular.module('ngAria_ngModelExample', ['ngAria'])
-    .controller('formsController', function($scope){
-      $scope.checked = false;
-      $scope.toggleCheckbox = function(){
-        $scope.checked = !$scope.checked;
-      };
-    })
-    .directive('someCheckbox', function(){
-      return {
-        restrict: 'E',
-        link: function($scope, $el, $attrs) {
-          $el.on('keypress', function(event){
-            event.preventDefault();
-            if(event.keyCode === 32 || event.keyCode === 13){
-              $scope.toggleCheckbox();
-              $scope.$apply();
-            }
-          });
-        }
-      };
-    })
-    .directive('showAttrs', function() {
-      return function($scope, $el, $attrs) {
-        var pre = document.createElement('pre');
-        $el.after(pre);
-        $scope.$watch(function() {
-          var $attrs = {};
-          Array.prototype.slice.call($el[0].attributes, 0).forEach(function(item) {
-            if (item.name !== 'show-$attrs') {
-              $attrs[item.name] = item.value;
-            }
-          });
-          return $attrs;
-        }, function(newAttrs, oldAttrs) {
-          pre.textContent = JSON.stringify(newAttrs, null, 2);
-        }, true);
-      };
-    });
-  </file>
-  <file name="style.css">
+ <file name="index.html">
+  <style>
     [role=checkbox] {
       cursor: pointer;
       display: inline-block;
@@ -132,7 +78,58 @@ attributes (if they have not been explicitly specified by the developer):
     pre {
       white-space: pre-wrap;
     }
-  </file>
+  </style>
+ <div>
+ <form ng-controller="formsController">
+  <some-checkbox role="checkbox" ng-model="checked" ng-class="{active: checked}"
+    ng-disabled="isDisabled" ng-click="toggleCheckbox()"
+    aria-label="Custom Checkbox" show-attrs>
+    <span class="icon" aria-hidden="true"></span>
+    Custom Checkbox
+  </some-checkbox>
+ </form>
+ </div>
+ <script>
+  var app = angular.module('ngAria_ngModelExample', ['ngAria'])
+  .controller('formsController', function($scope){
+    $scope.checked = false;
+    $scope.toggleCheckbox = function(){
+      $scope.checked = !$scope.checked;
+    }
+  })
+  .directive('someCheckbox', function(){
+    return {
+      restrict: 'E',
+      link: function($scope, $el, $attrs) {
+        $el.on('keypress', function(event){
+          event.preventDefault();
+          if(event.keyCode === 32 || event.keyCode === 13){
+            $scope.toggleCheckbox();
+            $scope.$apply();
+          }
+        });
+      }
+    }
+  })
+  .directive('showAttrs', function() {
+    return function($scope, $el, $attrs) {
+      var pre = document.createElement('pre');
+      $el.after(pre);
+      $scope.$watch(function() {
+        var $attrs = {};
+        Array.prototype.slice.call($el[0].attributes, 0).forEach(function(item) {
+          if (item.name !== 'show-$attrs') {
+            $attrs[item.name] = item.value;
+          }
+        });
+        return $attrs;
+      }, function(newAttrs, oldAttrs) {
+        pre.textContent = JSON.stringify(newAttrs, null, 2);
+      }, true);
+    }
+  });
+ </script>
+ </file>
 </example>
 
 ngAria will also add `tabIndex`, ensuring custom elements with these roles will be reachable from
@@ -140,93 +137,32 @@ the keyboard. It is still up to **you** as a developer to **ensure custom contro
 accessible**. As a rule, any time you create a widget involving user interaction, be sure to test
 it with your keyboard and at least one mobile and desktop screen reader.
 
-<h2 id="ngvaluechecked">ngValue and ngChecked</h2>
-
-To ease the transition between native inputs and custom controls, ngAria now supports
-{@link ng.ngValue ngValue} and {@link ng.ngChecked ngChecked}.
-The original directives were created for native inputs only, so ngAria extends
-support to custom elements by managing `aria-checked` for accessibility.
-
-### Example
-
-```html
-<custom-checkbox ng-checked="val"></custom-checkbox>
-<custom-radio-button ng-value="val"></custom-radio-button>
-```
-
-Becomes:
-
-```html
-<custom-checkbox ng-checked="val" aria-checked="true"></custom-checkbox>
-<custom-radio-button ng-value="val" aria-checked="true"></custom-radio-button>
-```
-
 <h2 id="ngdisabled">ngDisabled</h2>
 
 The `disabled` attribute is only valid for certain elements such as `button`, `input` and
 `textarea`. To properly disable custom element directives such as `<md-checkbox>` or `<taco-tab>`,
-using ngAria with {@link ng.ngDisabled ngDisabled} will also
+using ngAria with {@link ng.directive:ngDisabled ngDisabled} will also
 add `aria-disabled`. This tells assistive technologies when a non-native input is disabled, helping
 custom controls to be more accessible.
 
-### Example
+###Example
 
 ```html
-<md-checkbox ng-disabled="disabled"></md-checkbox>
+<md-checkbox ng-disabled="disabled">
 ```
 
 Becomes:
 
 ```html
-<md-checkbox disabled aria-disabled="true"></md-checkbox>
+<md-checkbox disabled aria-disabled="true">
 ```
 
-<div class="alert alert-info">
-You can check whether a control is legitimately disabled for a screen reader by visiting
+>You can check whether a control is legitimately disabled for a screen reader by visiting
 [chrome://accessibility](chrome://accessibility) and inspecting [the accessibility tree](http://www.paciellogroup.com/blog/2015/01/the-browser-accessibility-tree/).
-</div>
-
-<h2 id="ngrequired">ngRequired</h2>
-
-The boolean `required` attribute is only valid for native form controls such as `input` and
-`textarea`. To properly indicate custom element directives such as `<md-checkbox>` or `<custom-input>`
-as required, using ngAria with {@link ng.ngRequired ngRequired} will also add
-`aria-required`. This tells accessibility APIs when a custom control is required.
-
-### Example
-
-```html
-<md-checkbox ng-required="val"></md-checkbox>
-```
-
-Becomes:
-
-```html
-<md-checkbox ng-required="val" aria-required="true"></md-checkbox>
-```
-
-<h2 id="ngreadonly">ngReadonly</h2>
-
-The boolean `readonly` attribute is only valid for native form controls such as `input` and
-`textarea`. To properly indicate custom element directives such as `<md-checkbox>` or `<custom-input>`
-as required, using ngAria with {@link ng.ngReadonly ngReadonly} will also add
-`aria-readonly`. This tells accessibility APIs when a custom control is read-only.
-
-### Example
-
-```html
-<md-checkbox ng-readonly="val"></md-checkbox>
-```
-
-Becomes:
-
-```html
-<md-checkbox ng-readonly="val" aria-readonly="true"></md-checkbox>
-```
 
 <h2 id="ngshow">ngShow</h2>
 
-The {@link ng.ngShow ngShow} directive shows or hides the
+>The {@link ng.directive:ngShow ngShow} directive shows or hides the
 given HTML element based on the expression provided to the `ngShow` attribute. The element is
 shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
 
@@ -243,7 +179,7 @@ screen reader users won't accidentally focus on "mystery elements". Managing tab
 child control can be complex and affect performance, so it’s best to just stick with the default
 `display: none` CSS. See the [fourth rule of ARIA use](http://www.w3.org/TR/aria-in-html/#fourth-rule-of-aria-use).
 
-### Example
+###Example
 ```css
 .ng-hide {
   display: block;
@@ -263,7 +199,7 @@ Becomes:
 
 <h2 id="nghide">ngHide</h2>
 
-The {@link ng.ngHide ngHide} directive shows or hides the
+>The {@link ng.directive:ngHide ngHide} directive shows or hides the
 given HTML element based on the expression provided to the `ngHide` attribute. The element is
 shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
 
@@ -304,11 +240,11 @@ Becomes:
 
 <h2 id="ngmessages">ngMessages</h2>
 
-The ngMessages module makes it easy to display form validation or other messages with priority
+The new ngMessages module makes it easy to display form validation or other messages with priority
 sequencing and animation. To expose these visual messages to screen readers,
 ngAria injects `aria-live="assertive"`, causing them to be read aloud any time a message is shown,
 regardless of the user's focus location.
-### Example
+###Example
 
 ```html
 <div ng-messages="myForm.myName.$error">
@@ -326,7 +262,7 @@ Becomes:
 </div>
 ```
 
-## Disabling attributes
+##Disabling attributes
 The attribute magic of ngAria may not work for every scenario. To disable individual attributes,
 you can use the {@link ngAria.$ariaProvider#config config} method. Just keep in mind this will
 tell ngAria to ignore the attribute globally.
@@ -364,7 +300,7 @@ tell ngAria to ignore the attribute globally.
  </file>
 </example>
 
-## Common Accessibility Patterns
+##Common Accessibility Patterns
 
 Accessibility best practices that apply to web apps in general also apply to Angular.
 

docs/content/guide/animations.ngdoc

@@ -6,7 +6,7 @@
 
 # Animations
 
-AngularJS provides animation hooks for common directives such as `ngRepeat`, `ngSwitch`, and `ngView`, as well as custom directives
+AngularJS 1.3 provides animation hooks for common directives such as `ngRepeat`, `ngSwitch`, and `ngView`, as well as custom directives
 via the `$animate` service. These animation hooks are set in place to trigger animations during the life cycle of various directives and when
 triggered, will attempt to perform a CSS Transition, CSS Keyframe Animation or a JavaScript callback Animation (depending on if an animation is
 placed on the given directive). Animations can be placed using vanilla CSS by following the naming conventions set in place by AngularJS
@@ -274,100 +274,6 @@ myModule.directive('my-directive', ['$animate', function($animate) {
 }]);
 ```
 
-## Animations on app bootstrap / page load
-
-By default, animations are disabled when the Angular app {@link guide/bootstrap bootstraps}. If you are using the {@link ngApp} directive,
-this happens in the `DOMContentLoaded` event, so immediately after the page has been loaded.
-Animations are disabled, so that UI and content are instantly visible. Otherwise, with many animations on
-the page, the loading process may become too visually overwhelming, and the performance may suffer.
-
-Internally, `ngAnimate` waits until all template downloads that are started right after bootstrap have finished.
-Then, it waits for the currently running {@link ng.$rootScope.Scope#$digest} and the one after that to finish.
-This ensures that the whole app has been compiled fully before animations are attempted.
-
-If you do want your animations to play when the app bootstraps, you can enable animations globally in
-your main module's {@link angular.Module#run run} function:
-
-```js
-myModule.run(function($animate) {
-  $animate.enabled(true);
-});
-```
-
-## How to (selectively) enable, disable and skip animations
-
-There are three different ways to disable animations, both globally and for specific animations.
-Disabling specific animations can help to speed up the render performance, for example for large `ngRepeat`
-lists that don't actually have animations. Because ngAnimate checks at runtime if animations are present,
-performance will take a hit even if an element has no animation.
-
-### In the config: {@link $animateProvider#classNameFilter $animateProvider.classNameFilter()}
-
-This function can be called in the {@link angular.Module#config config} phase of an app. It takes a regex as the only argument,
-which will then be matched against the classes of any element that is about to be animated. The regex
-allows a lot of flexibility - you can either allow animations only for specific classes (useful when
-you are working with 3rd party animations), or exclude specific classes from getting animated.
-
-```js
-app.config(function($animateProvider) {
-  $animateProvider.classNameFilter(/animate-/);
-});
-```
-
-```css
-/* prefixed with animate- */
-.animate-fade-add.animate-fade-add-active {
-  transition:1s linear all;
-  opacity:0;
-}
-```
-
-The classNameFilter approach generally applies the biggest speed boost, because the matching is
-done before any other animation disabling strategies are checked. However, that also means it is not
-possible to override class name matching with the two following strategies. It's of course still possible
-to enable / disable animations by changing an element's class name at runtime.
-
-### At runtime: {@link ng.$animate#enabled $animate.enabled()}
-
-This function can be used to enable / disable animations in two different ways:
-
-With a single `boolean` argument, it enables / disables animations globally: `$animate.enabled(false)`
-disables all animations in your app.
-
-When the second argument is a native DOM or jQuery element, the function enables / disables
-animations on this element *and all its children*: `$animate.enabled(false, myElement)`. This is the
-most flexible way to change the animation state. For example, even if you have used it to disable
-animations on a parent element, you can still re-enable it for a child element. And compared to the
-`classNameFilter`, you can change the animation status at runtime instead of during the config phase.
-
-Note however that the `$animate.enabled()` state for individual elements does not overwrite disabling
-rules that have been set in the {@link $animateProvider#classNameFilter classNameFilter}.
-
-### Via CSS styles: overwriting styles in the `ng-animate` CSS class
-Whenever an animation is started, ngAnimate applies the `ng-animate` class to the element for the
-whole duration of the animation. By applying CSS transition / animation styling to the class,
-you can skip an animation:
-
-```css
-
-.my-class{
-  transition: transform 2s;
-}
-
-.my-class:hover {
-  transform: translateX(50px);
-}
-
-my-class.ng-animate {
-  transition: 0s;
-}
-
-```
-
-By setting `transition: 0s`, ngAnimate will ignore the existing transition styles, and not try to animate them (Javascript
-animations will still execute, though). This can be used to prevent {@link guide/animations#preventing-collisions-with-existing-animations-and-third-party-libraries
-issues with existing animations interfering with ngAnimate}.
-
 ## Preventing flicker before an animation starts
 
 When nesting elements with structural animations such as `ngIf` into elements that have class-based
@@ -399,49 +305,6 @@ In that case, you can add styles to the CSS that make sure the element stays hid
 /* Other animation styles ... */
 ```
 
-## Preventing Collisions with Existing Animations and Third Party Libraries
-By default, any `ngAnimate` enabled directives will assume any transition / animation styles on the
-element are part of an `ngAnimate` animation. This can lead to problems when the styles are actually
-for animations that are independent of `ngAnimate`.
-
-For example, an element acts as a loading spinner. It has an inifinite css animation on it, and also an
-{@link ngIf `ngIf`} directive, for which no animations are defined:
-
-```css
-@keyframes rotating {
-    from { transform: rotate(0deg); }
-    to { transform: rotate(360deg); }
-}
-
-.spinner {
-    animation: rotating 2s linear infinite;
-}
-```
-
-Now, when the `ngIf` changes, `ngAnimate` will see the spinner animation and use
-it to animate the `enter`/`leave` event, which doesn't work because
-the animation is infinite. The element will still be added / removed after a timeout, but there will be a
-noticable delay.
-
-This might also happen because some third-party frameworks place animation duration defaults
-across many element or className selectors in order to make their code small and reuseable.
-
-You can prevent this unwanted behavior by adding CSS to the `.ng-animate` class that is added
-for the whole duration of an animation. Simply overwrite the transition / animation duration. In the
-case of the spinner, this would be:
-
-```css
-.spinner.ng-animate {
-    transition: 0s none;
-    animation: 0s none;
-}
-```
-
-If you do have CSS transitions / animations defined for the animation events, make sure they have higher priority
-than any styles that are independent from ngAnimate.
-
-You can also use one of the two other {@link guide/animations#how-to-selectively-enable-disable-and-skip-animations strategies to disable animations}.
-
 ## More about animations
 
 For a full breakdown of each method available on `$animate`, see the {@link ng.$animate API documentation}.

docs/content/guide/bootstrap.ngdoc

@@ -53,13 +53,13 @@ initialization.
 
 Angular initializes automatically upon `DOMContentLoaded` event or when the `angular.js` script is
 evaluated if at that time `document.readyState` is set to `'complete'`. At this point Angular looks
-for the {@link ng.directive:ngApp `ngApp`} directive which designates your application root.
-If the {@link ng.directive:ngApp `ngApp`} directive is found then Angular will:
+for the {@link ng.directive:ngApp `ng-app`} directive which designates your application root.
+If the {@link ng.directive:ngApp `ng-app`} directive is found then Angular will:
 
   * load the {@link guide/module module} associated with the directive.
   * create the application {@link auto.$injector injector}
   * compile the DOM treating the {@link ng.directive:ngApp
-    `ngApp`} directive as the root of the compilation. This allows you to tell it to treat only a
+    `ng-app`} directive as the root of the compilation. This allows you to tell it to treat only a
     portion of the DOM as an Angular application.
 
 
@@ -142,17 +142,6 @@ This is the sequence that your code should follow:
   2. Call {@link angular.bootstrap} to {@link compiler compile} the element into an
   executable, bi-directionally bound application.
 
-## Things to keep in mind
-
-There a few things to keep in mind regardless of automatic or manual bootstrapping:
-
-- While it's possible to bootstrap more than one AngularJS application per page, we don't actively
-  test against this scenario. It's possible that you'll run into problems, especially with complex apps, so
-  caution is advised.
-- Do not bootstrap your app on an element with a directive that uses {@link ng.$compile#transclusion transclusion}, such as
-  {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and {@link ngRoute.ngView `ngView`}.
-  Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
-  causing animations to stop working and making the injector inaccessible from outside the app.
 
 ## Deferred Bootstrap
 

docs/content/guide/component.ngdoc

@@ -1,497 +0,0 @@
-@ngdoc overview
-@name Components
-@sortOrder 305
-@description
-
-# Understanding Components
-
-In Angular, a Component is a special kind of {@link guide/directive directive} that uses a simpler
-configuration which is suitable for a component-based application structure.
-
-This makes it easier to write an app in a way that's similar to using Web Components or using Angular
-2's style of application architecture.
-
-Advantages of Components:
-- simpler configuration than plain directives
-- promote sane defaults and best practices
-- optimized for component-based architecture
-- writing component directives will make it easier to upgrade to Angular 2
-
-When not to use Components:
-
-- for directives that rely on DOM manipulation, adding event listeners etc, because the compile
-and link functions are unavailable
-- when you need advanced directive definition options like priority, terminal, multi-element
-- when you want a directive that is triggered by an attribute or CSS class, rather than an element
-
-## Creating and configuring a Component
-
-Components can be registered using the `.component()` method of an Angular 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.)
-
-<example name="heroComponentSimple" module="heroApp">
-<file name="index.js">
-  angular.module('heroApp', []).controller('mainCtrl', function() {
-    this.hero = {
-      name: 'Spawn'
-    };
-  });
-</file>
-<file name="heroDetail.js">
-
-  function HeroDetailController() {
-
-  }
-
-  angular.module('heroApp').component('heroDetail', {
-    templateUrl: 'heroDetail.html',
-    controller: HeroDetailController,
-    bindings: {
-      hero: '='
-    }
-  });
-</file>
-<file name="index.html">
-  <!-- components match only elements -->
-  <div ng-controller="mainCtrl as ctrl">
-    <b>Hero</b><br>
-    <hero-detail hero="ctrl.hero"></hero-detail>
-  </div>
-</file>
-<file name="heroDetail.html">
-  <span>Name: {{$ctrl.hero.name}}</span>
-</file>
-</example>
-
-It's also possible to add components via {@link $compileProvider#component} in a module's config phase.
-
-### Comparison between Directive definition and Component definition
-
-|                   | Directive            | Component       |
-|-------------------|----------------------|-----------------|
-| bindings          | No                   | Yes (binds to controller)      |
-| bindToController  | Yes (default: false) | No (use bindings instead)       |
-| compile function  | Yes                  | No       |
-| controller        | Yes                  | Yes (default `function() {}`)     |
-| controllerAs      | Yes (default: false) | Yes (default: `$ctrl`)       |
-| link functions    | Yes                  | No       |
-| multiElement      | Yes                  | No       |
-| priority          | Yes                  | No       |
-| require           | Yes                  | Yes      |
-| restrict          | Yes                  | No (restricted to elements only)      |
-| scope             | Yes (default: false) | No (scope is always isolate)      |
-| template          | Yes                  | Yes, injectable      |
-| templateNamespace | Yes                  | No       |
-| templateUrl       | Yes                  | Yes, injectable       |
-| terminal          | Yes                  | No       |
-| transclude        | Yes (default: false) | Yes (default: false)      |
-
-
-## Component-based application architecture
-
-As already mentioned, the component helper makes it easier to structure your application with
-a component-based architecture. But what makes a component beyond the options that
-the component helper has?
-
-- **Components only control their own View and Data:**
-Components should never modify any data or DOM that is out of their own scope. Normally, in Angular
-it is possible to modify data anywhere in the application through scope inheritance and watches. This
-is practical, but can also lead to problems when it is not clear which part of the application is
-responsible for modifying the data. That is why component directives use an isolate scope, so a whole
-class of scope manipulation is not possible.
-
-- **Components have a well-defined public API - Inputs and Outputs:**
-However, scope isolation only goes so far, because Angular uses two-way binding. So if you pass
-an object to a component like this - `bindings: {item: '='}`, and modify one of its properties, the
-change will be reflected in the parent component. For components however, only the component that owns
-the data should modify it, to make it easy to reason about what data is changed, and when. For that reason,
-components should follow a few simple conventions:
-
-  - Inputs should be using `<` and `@` bindings. The `<` symbol denotes {@link $compile#-scope- one-way bindings} which are
-    available since 1.5. The difference to `=` is that the bound properties in the component scope are not watched, which means
-    if you assign a new value to the property in the component scope, it will not update the parent scope. Note however, that both parent
-    and component scope reference the same object, so if you are changing object properties or array elements in the
-    component, the parent will still reflect that change.
-    The general rule should therefore be to never change an object or array property in the component scope.
-    `@` bindings can be used when the input is a string, especially when the value of the binding doesn't change.
-    ```js
-      bindings: {
-        hero: '<',
-        comment: '@'
-      }
-    ```
-  - Outputs are realized with `&` bindings, which function as callbacks to component events.
-    ```js
-      bindings: {
-        onDelete: '&',
-        onUpdate: '&'
-      }
-    ```
-  - Instead of manipulating Input Data, the component calls the correct Output Event with the changed data.
-    For a deletion, that means the component doesn't delete the `hero` itself, but sends it back to
-    the owner component via the correct event.
-    ```html
-        <!-- note that we use snake case for bindings in the template as usual -->
-        <editable-field on-update="$ctrl.update('location', value)"></editable-field><br>
-        <button ng-click="$ctrl.onDelete({hero: $ctrl.hero})">Delete</button>
-    ```
-  - That way, the parent component can decide what to do with the event (e.g. delete an item or update the properties)
-    ```js
-      ctrl.deleteHero(hero) {
-        $http.delete(...).then(function() {
-          var idx = ctrl.list.indexOf(hero);
-          if (idx >= 0) {
-            ctrl.list.splice(idx, 1);
-          }
-        });
-      }
-    ```
-
-- **Components have a well-defined lifecycle**
-Each component can implement "lifecycle hooks". These are methods that will be called at certain points in the life
-of the component. The following hook methods can be implemented:
-
-  * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
-    had their bindings initialized (and before the pre &amp; post linking functions for the directives on
-    this element). This is a good place to put initialization code for your controller.
-  * `$onChanges(changesObj)` - Called whenever one-way bindings are updated. The `changesObj` is a hash whose keys
-    are the names of the bound properties that have changed, and the values are an object of the form
-    `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a component such as
-    cloning the bound value to prevent accidental mutation of the outer value.
-  * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
-    external resources, watches and event handlers.
-  * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
-    function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
-    Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
-    they are waiting for their template to load asynchronously and their own compilation and linking has been
-    suspended until that occurs.
-    This hook can be considered analogous to the `ngAfterViewInit` and `ngAfterContentInit` hooks in Angular 2.
-    Since the compilation process is rather different in Angular 1 there is no direct mapping and care should
-    be taken when upgrading.
-
-By implementing these methods, your component can hook into its lifecycle.
-
-- **An application is a tree of components:**
-Ideally, the whole application should be a tree of components that implement clearly defined inputs
-and outputs, and minimize two-way data binding. That way, it's easier to predict when data changes and what the state
-of a component is.
-
-## Example of a component tree
-
-The following example expands on the simple component example and incorporates the concepts we introduced
-above:
-
-Instead of an ngController, we now have a heroList component that holds the data of
-different heroes, and creates a heroDetail for each of them.
-
-The heroDetail component now contains new functionality:
-- a delete button that calls the bound `onDelete` function of the heroList component
-- an input to change the hero location, in the form of a reusable editableField component. Instead
-of manipulating the hero object itself, it sends a changeset upwards to the heroDetail, which sends
-it upwards to the heroList component, which updates the original data.
-
-<example name="heroComponentTree" module="heroApp">
-<file name="index.js">
-  var mode = angular.module('heroApp', []);
-</file>
-
-<file name="heroList.js">
-  function HeroListController($scope, $element, $attrs) {
-    var ctrl = this;
-
-    // This would be loaded by $http etc.
-    ctrl.list = [
-      {
-        name: 'Superman',
-        location: ''
-      },
-      {
-        name: 'Batman',
-        location: 'Wayne Manor'
-      }
-    ];
-
-    ctrl.updateHero = function(hero, prop, value) {
-      hero[prop] = value;
-    };
-
-    ctrl.deleteHero = function(hero) {
-      var idx = ctrl.list.indexOf(hero);
-      if (idx >= 0) {
-        ctrl.list.splice(idx, 1);
-      }
-    };
-  }
-
-  angular.module('heroApp').component('heroList', {
-    templateUrl: 'heroList.html',
-    controller: HeroListController
-  });
-
-</file>
-
-<file name="heroDetail.js">
-  function HeroDetailController($scope, $element, $attrs) {
-    var ctrl = this;
-
-    ctrl.update = function(prop, value) {
-      ctrl.onUpdate({hero: ctrl.hero, prop: prop, value: value});
-    };
-  }
-
-  angular.module('heroApp').component('heroDetail', {
-    templateUrl: 'heroDetail.html',
-    controller: HeroDetailController,
-    bindings: {
-      hero: '<',
-      onDelete: '&',
-      onUpdate: '&'
-    }
-  });
-</file>
-
-<file name="editableField.js">
-
-  function EditableFieldController($scope, $element, $attrs) {
-    var ctrl = this;
-    ctrl.editMode = false;
-
-    ctrl.handleModeChange = function() {
-      if (ctrl.editMode) {
-        ctrl.onUpdate({value: ctrl.fieldValue});
-        ctrl.fieldValueCopy = ctrl.fieldValue;
-      }
-      ctrl.editMode = !ctrl.editMode;
-    };
-
-    ctrl.reset = function() {
-      ctrl.fieldValue = ctrl.fieldValueCopy;
-    };
-
-    ctrl.$onInit = function() {
-      // Make a copy of the initial value to be able to reset it later
-      ctrl.fieldValueCopy = ctrl.fieldValue;
-
-      // Set a default fieldType
-      if (!ctrl.fieldType) {
-        ctrl.fieldType = 'text';
-      }
-    };
-  }
-
-  angular.module('heroApp').component('editableField', {
-    templateUrl: 'editableField.html',
-    controller: EditableFieldController,
-    bindings: {
-      fieldValue: '<',
-      fieldType: '@?',
-      onUpdate: '&'
-    }
-  });
-</file>
-<file name="index.html">
-  <hero-list></hero-list>
-</file>
-<file name="heroList.html">
-  <b>Heroes</b><br>
-  <hero-detail ng-repeat="hero in $ctrl.list" hero="hero" on-delete="$ctrl.deleteHero(hero)" on-update="$ctrl.updateHero(hero, prop, value)"></hero-detail>
-</file>
-<file name="heroDetail.html">
-  <hr>
-  <div>
-    Name: {{$ctrl.hero.name}}<br>
-    Location: <editable-field field-value="$ctrl.hero.location" field-type="text" on-update="$ctrl.update('location', value)"></editable-field><br>
-    <button ng-click="$ctrl.onDelete({hero: $ctrl.hero})">Delete</button>
-  </div>
-</file>
-<file name="editableField.html">
-  <span ng-switch="$ctrl.editMode">
-    <input ng-switch-when="true" type="{{$ctrl.fieldType}}" ng-model="$ctrl.fieldValue">
-    <span ng-switch-default>{{$ctrl.fieldValue}}</span>
-  </span>
-  <button ng-click="$ctrl.handleModeChange()">{{$ctrl.editMode ? 'Save' : 'Edit'}}</button>
-  <button ng-if="$ctrl.editMode" ng-click="$ctrl.reset()">Reset</button>
-</file>
-</example>
-
-## Components as route templates
-Components are also useful as route templates (e.g. when using {@link ngRoute ngRoute}). In a component-based
-application, every view is a component:
-
-```js
-  var myMod = angular.module('myMod', ['ngRoute']);
-  myMod.component('home', {
-    template: '<h1>Home</h1><p>Hello, {{ $ctrl.user.name }} !</p>',
-    controller: function() {
-      this.user = {name: 'world'};
-    }
-  });
-  myMod.config(function($routeProvider) {
-    $routeProvider.when('/', {
-      template: '<home></home>'
-    });
-  });
-```
-<br />
-When using {@link ngRoute.$routeProvider $routeProvider}, you can often avoid some
-boilerplate, by passing the resolved route dependencies directly to the component. Since 1.5,
-ngRoute automatically assigns the resolves to the route scope property `$resolve` (you can also
-configure the property name via `resolveAs`). When using components, you can take advantage of this and pass resolves
-directly into your component without creating an extra route controller:
-
-```js
-  var myMod = angular.module('myMod', ['ngRoute']);
-  myMod.component('home', {
-    template: '<h1>Home</h1><p>Hello, {{ $ctrl.user.name }} !</p>',
-    bindings: {
-      user: '<'
-    }
-  });
-  myMod.config(function($routeProvider) {
-    $routeProvider.when('/', {
-      template: '<home user="$resolve.user"></home>',
-      resolve: {
-        user: function($http) { return $http.get('...'); }
-      }
-    });
-  });
-```
-
-## Intercomponent Communication
-
-Directives can require the controllers of other directives to enable communication
-between each other. This can be achieved in a component by providing an
-object mapping for the `require` property. The object keys specify the property names under which
-the required controllers (object values) will be bound to the requiring component's controller.
-
-<div class="alert alert-warning">
-Note that the required controllers will not be available during the instantiation of the controller,
-but they are guaranteed to be available just before the `$onInit` method is executed!
-</div>
-
-Here is a tab pane example built from components:
-
-<example module="docsTabsExample">
-  <file name="script.js">
-angular.module('docsTabsExample', [])
-  .component('myTabs', {
-    transclude: true,
-    controller: function() {
-      var panes = this.panes = [];
-      this.select = function(pane) {
-        angular.forEach(panes, function(pane) {
-          pane.selected = false;
-        });
-        pane.selected = true;
-      };
-      this.addPane = function(pane) {
-        if (panes.length === 0) {
-          this.select(pane);
-        }
-        panes.push(pane);
-      };
-    },
-    templateUrl: 'my-tabs.html'
-  })
-  .component('myPane', {
-    transclude: true,
-    require: {
-      tabsCtrl: '^myTabs'
-    },
-    bindings: {
-      title: '@'
-    },
-    controller: function() {
-      this.$onInit = function() {
-        this.tabsCtrl.addPane(this);
-        console.log(this);
-      };
-    },
-    templateUrl: 'my-pane.html'
-  });
-  </file>
-  <file name="index.html">
-  <my-tabs>
-    <my-pane title="Hello">
-      <h4>Hello</h4>
-      <p>Lorem ipsum dolor sit amet</p>
-    </my-pane>
-    <my-pane title="World">
-      <h4>World</h4>
-      <em>Mauris elementum elementum enim at suscipit.</em>
-      <p><a href ng-click="i = i + 1">counter: {{i || 0}}</a></p>
-    </my-pane>
-  </my-tabs>
-  </file>
-  <file name="my-tabs.html">
-  <div class="tabbable">
-    <ul class="nav nav-tabs">
-      <li ng-repeat="pane in $ctrl.panes" ng-class="{active:pane.selected}">
-        <a href="" ng-click="$ctrl.select(pane)">{{pane.title}}</a>
-      </li>
-    </ul>
-    <div class="tab-content" ng-transclude></div>
-  </div>
-  </file>
-  <file name="my-pane.html">
-    <div class="tab-pane" ng-show="$ctrl.selected" ng-transclude></div>
-  </file>
-</example>
-
-
-# Unit-testing Component Controllers
-
-The easiest way to unit-test a component controller is by using the {@link ngMock.$componentController $componentController}
-that is included in {@link ngMock}. The advantage of this method is that you do not have
-to create any DOM elements. The following example shows how to do this for the `heroDetail` component
-from above.
-
-The examples use the [Jasmine](http://jasmine.github.io/) testing framework.
-
-**Controller Test:**
-```js
-describe('component: heroDetail', function() {
-  var component, scope, hero, $componentController;
-
-  beforeEach(module('simpleComponent'));
-
-  beforeEach(inject(function($rootScope, _$componentController_) {
-    scope = $rootScope.$new();
-    $componentController = _$componentController_;
-    hero = {name: 'Wolverine'};
-  }));
-
-  it('should set the default values of the hero', function() {
-    // It's necessary to always pass the scope in the locals, so that the controller instance can be bound to it
-    component = $componentController('heroDetail', {$scope: scope});
-
-    expect(component.hero).toEqual({
-      name: undefined,
-      location: 'unknown'
-    });
-  });
-
-  it('should assign the name bindings to the hero object', function() {
-    // Here we are passing actual bindings to the component
-
-    component = $componentController('heroDetail',
-      {$scope: scope},
-      {hero: hero}
-    );
-    expect(component.hero.name).toBe('Wolverine');
-  });
-
-  it('should call the onDelete binding when a hero is deleted', function() {
-    component = $componentController('heroDetail',
-      {$scope: scope},
-      {hero: hero, onDelete: jasmine.createSpy('deleteSpy')}
-    );
-
-    component.onDelete({hero: component.hero});
-    expect(spy('deleteSpy')).toHaveBeenCalledWith(component.hero);
-  });
-
-});
-```

docs/content/guide/concepts.ngdoc

@@ -334,9 +334,9 @@ The following example shows how this is done with Angular:
         var refresh = function() {
           var url = YAHOO_FINANCE_URL_PATTERN.
                      replace('PAIRS', 'USD' + currencies.join('","USD'));
-          return $http.jsonp(url).then(function(response) {
+          return $http.jsonp(url).success(function(data) {
             var newUsdToForeignRates = {};
-            angular.forEach(response.data.query.results.rate, function(rate) {
+            angular.forEach(data.query.results.rate, function(rate) {
               var currency = rate.id.substring(3,6);
               newUsdToForeignRates[currency] = window.parseFloat(rate.Rate);
             });

docs/content/guide/decorators.ngdoc

@@ -0,0 +1,486 @@
+@ngdoc overview
+@name Decorators
+@sortOrder 345
+@description
+
+# Decorators in AngularJS
+
+<div class="alert alert-warning">
+  **NOTE:** This guide is targeted towards developers who are already familiar with AngularJS basics.
+  If you're just getting started, we recommend the {@link tutorial/ tutorial} first.
+</div>
+
+## What are decorators?
+
+Decorators are a design pattern that is used to separate modification or *decoration* of a class without modifying the
+original source code. In Angular, decorators are functions that allow a service, directive or filter to be modified
+prior to its usage.
+
+## How to use decorators
+
+There are two ways to register decorators
+
+- `$provide.decorator`, and
+- `module.decorator`
+
+Each provide access to a `$delegate`, which is the instantiated service/directive/filter, prior to being passed to the
+service that required it.
+
+### $provide.decorator
+
+The {@link api/auto/service/$provide#decorator decorator function} allows access to a $delegate of the service once it
+has been instantiated. For example:
+
+```js
+angular.module('myApp', [])
+
+.config([ '$provide', function($provide) {
+
+  $provide.decorator('$log', [
+    '$delegate',
+    function $logDecorator($delegate) {
+
+      var originalWarn = $delegate.warn;
+      $delegate.warn = function decoratedWarn(msg) {
+        msg = 'Decorated Warn: ' + msg;
+        originalWarn.apply($delegate, arguments);
+      };
+
+      return $delegate;
+    }
+  ]);
+}]);
+```
+
+After the `$log` service has been instantiated the decorator is fired. The decorator function has a `$delegate` object
+injected to provide access to the service that matches the selector in the decorator. This `$delegate` will be the
+service you are decorating. The return value of the function *provided to the decorator* will take place of the service,
+directive, or filter being decorated.
+
+<hr>
+
+The `$delegate` may be either modified or completely replaced. Given a service `myService` with a method `someFn`, the
+following could all be viable solutions:
+
+
+#### Completely Replace the $delegate
+```js
+angular.module('myApp', [])
+
+.config([ '$provide', function($provide) {
+
+  $provide.decorator('myService', [
+    '$delegate',
+    function myServiceDecorator($delegate) {
+
+      var myDecoratedService = {
+        // new service object to replace myService
+      };
+      return myDecoratedService;
+    }
+  ]);
+}]);
+```
+
+#### Patch the $delegate
+```js
+angular.module('myApp', [])
+
+.config([ '$provide', function($provide) {
+
+  $provide.decorator('myService', [
+    '$delegate',
+    function myServiceDecorator($delegate) {
+
+      var someFn = $delegate.someFn;
+
+      function aNewFn() {
+        // new service function
+        someFn.apply($delegate, arguments);
+      }
+
+      $delegate.someFn = aNewFn;
+      return $delegate;
+    }
+  ]);
+}]);
+```
+
+#### Augment the $delegate
+```js
+angular.module('myApp', [])
+
+.config([ '$provide', function($provide) {
+
+  $provide.decorator('myService', [
+    '$delegate',
+    function myServiceDecorator($delegate) {
+
+      function helperFn() {
+        // an additional fn to add to the service
+      }
+
+      $delegate.aHelpfulAddition = helperFn;
+      return $delegate;
+    }
+  ]);
+}]);
+```
+
+<div class="alert alert-info">
+  Note that whatever is returned by the decorator function will replace that which is being decorated. For example, a
+  missing return statement will wipe out the entire object being decorated.
+</div>
+
+<hr>
+
+Decorators have different rules for different services. This is because services are registered in different ways.
+Services are selected by name, however filters and directives are selected by appending `"Filter"` or `"Directive"` to
+the end of the name. The `$delegate` provided is dictated by the type of service.
+
+| Service Type | Selector                      | $delegate                                                             |
+|--------------|-------------------------------|-----------------------------------------------------------------------|
+| Service      | `serviceName`                 | The `object` or `function` returned by the service                    |
+| Directive    | `directiveName + 'Directive'` | An `Array.<DirectiveObject>`<sub>{@link guide/decorators#drtvArray 1}</sub> |
+| Filter       | `filterName + 'Filter'`       | The `function` returned by the filter                                 |
+
+<small id="drtvArray">1. Multiple directives may be registered to the same selector/name</small>
+
+<div class="alert alert-warning">
+  **NOTE:** Developers should take care in how and why they are modifying the `$delegate` for the service. Not only
+  should expectations for the consumer be kept, but some functionality (such as directive registration) does not take
+  place after decoration, but during creation/registration of the original service. This means, for example, that
+  an action such as pushing a directive object to a directive `$delegate` will likely result in unexpected behavior.
+
+  Furthermore, great care should be taken when decorating core services, directives, or filters as this may unexpectedly
+  or adversely affect the functionality of the framework.
+</div>
+
+### module.decorator
+
+This {@link api/ng/type/angular.Module#decorator function} is the same as the `$provide.decorator` function except it is
+exposed through the module API. This allows you to separate your decorator patterns from your module config blocks. The
+main caveat here is that you will need to take note the order in which you create your decorators.
+
+Unlike in the module config block (which allows configuration of services prior to their creation), the service must be
+registered prior to the decorator (see {@link guide/providers#provider-recipe Provider Recipe}). For example, the
+following would not work because you are attempting to decorate outside of the configuration phase and the service
+hasn't been created yet:
+
+```js
+// will cause an error since 'someService' hasn't been registered
+angular.module('myApp').decorator('someService', ...);
+
+angular.module('myApp').factory('someService', ...);
+```
+
+## Example Applications
+
+The following sections provide examples each of a service decorator, a directive decorator, and a filter decorator.
+
+### Service Decorator Example
+
+This example shows how we can replace the $log service with our own to display log messages.
+
+<example module="myServiceDecorator" name="service-decorator">
+  <file name="script.js">
+    angular.module('myServiceDecorator', []).
+
+      controller('Ctrl', [
+        '$scope',
+        '$log',
+        '$timeout',
+        function($scope, $log, $timeout) {
+          var types = ['error', 'warn', 'log', 'info' ,'debug'], i;
+
+          for (i = 0; i < types.length; i++) {
+            $log[types[i]](types[i] + ': message ' + (i + 1));
+          }
+
+          $timeout(function() {
+            $log.info('info: message logged in timeout');
+          });
+        }
+      ]).
+
+      directive('myLog', [
+        '$log',
+        function($log) {
+          return {
+            restrict: 'E',
+            template: '<ul id="myLog"><li ng-repeat="l in myLog" class="{{l.type}}">{{l.message}}</li></ul>',
+            scope: {},
+            compile: function() {
+              return function(scope) {
+                scope.myLog = $log.stack;
+              };
+            }
+          };
+        }
+      ]).
+
+      config([
+        '$provide',
+        function($provide) {
+
+          $provide.decorator('$log', [
+            '$delegate',
+            function logDecorator($delegate) {
+
+              var myLog = {
+                warn: function(msg) {
+                  log(msg, 'warn');
+                },
+                error: function(msg) {
+                  log(msg, 'error');
+                },
+                info: function(msg) {
+                  log(msg, 'info');
+                },
+                debug: function(msg) {
+                  log(msg, 'debug');
+                },
+                log: function(msg) {
+                  log(msg, 'log');
+                },
+                stack: []
+              };
+
+              function log(msg, type) {
+                myLog.stack.push({ type: type, message: msg.toString() });
+                if (console && console[type]) console[type](msg);
+              }
+
+              return myLog;
+
+            }
+          ]);
+
+        }
+      ]);
+  </file>
+
+  <file name="index.html">
+    <div ng-controller="Ctrl">
+      <h1>Logs</h1>
+      <my-log></my-log>
+    </div>
+  </file>
+
+  <file name="style.css">
+    li.warn { color: yellow; }
+    li.error { color: red; }
+    li.info { color: blue }
+    li.log { color: black }
+    li.debug { color: green }
+  </file>
+
+  <file name="protractor.js" type="protractor">
+    it('should display log messages in dom', function() {
+      element.all(by.repeater('l in myLog')).count().then(function(count) {
+        expect(count).toEqual(6);
+      });
+    });
+  </file>
+</example>
+
+### Directive Decorator Example
+
+Failed interpolated expressions in `ng-href` attributes can easily go unnoticed. We can decorate `ngHref` to warn us of
+those conditions.
+
+<example module="urlDecorator" name="directive-decorator">
+  <file name="script.js">
+    angular.module('urlDecorator', []).
+
+      controller('Ctrl', ['$scope', function ($scope) {
+        $scope.id = 3;
+        $scope.warnCount = 0; // for testing
+      }]).
+
+      config(['$provide', function($provide) {
+
+        // matchExpressions looks for interpolation markup in the directive attribute, extracts the expressions
+        // from that markup (if they exist) and returns an array of those expressions
+        function matchExpressions(str) {
+          var exps = str.match(/{{([^}]+)}}/g);
+
+          // if there isn't any, get out of here
+          if (exps === null) return;
+
+          exps = exps.map(function(exp) {
+            var prop = exp.match(/[^{}]+/);
+            return prop === null ? null : prop[0];
+          });
+
+          return exps;
+        }
+
+        // remember: directives must be selected by appending 'Directive' to the directive selector
+        $provide.decorator('ngHrefDirective', [
+          '$delegate',
+          '$log',
+          '$parse',
+          function($delegate, $log, $parse) {
+
+            // store the original link fn
+            var originalLinkFn = $delegate[0].link;
+
+            // replace the compile fn
+            $delegate[0].compile = function(tElem, tAttr) {
+
+              // store the original exp in the directive attribute for our warning message
+              var originalExp = tAttr.ngHref;
+
+              // get the interpolated expressions
+              var exps = matchExpressions(originalExp);
+
+              // create and store the getters using $parse
+              var getters = exps.map(function(el) {
+                if (el) return $parse(el);
+              });
+
+              return function newLinkFn(scope, elem, attr) {
+                // fire the originalLinkFn
+                originalLinkFn.apply($delegate[0], arguments);
+
+                // observe the directive attr and check the expressions
+                attr.$observe('ngHref', function(val) {
+
+                  // if we have getters and getters is an array...
+                  if (getters && angular.isArray(getters)) {
+
+                    // loop through the getters and process them
+                    angular.forEach(getters, function(g, idx) {
+
+                      // if val is truthy, then the warning won't log
+                      var val = angular.isFunction(g) ? g(scope) : true;
+                      if (!val) {
+                        $log.warn('NgHref Warning: "' + exps[idx] + '" in the expression "' + originalExp +
+                          '" is falsy!');
+
+                        scope.warnCount++; // for testing
+                      }
+
+                    });
+
+                  }
+
+                });
+
+              };
+
+            };
+
+            // get rid of the old link function since we return a link function in compile
+            delete $delegate[0].link;
+
+            // return the $delegate
+            return $delegate;
+
+          }
+
+        ]);
+
+      }]);
+  </file>
+
+  <file name="index.html">
+    <div ng-controller="Ctrl">
+      <a ng-href="/products/{{ id }}/view" id="id3">View Product {{ id }}</a>
+      - <strong>id == 3</strong>, so no warning<br>
+      <a ng-href="/products/{{ id + 5 }}/view" id="id8">View Product {{ id + 5 }}</a>
+      - <strong>id + 5 == 8</strong>, so no warning<br>
+      <a ng-href="/products/{{ someOtherId }}/view" id="someOtherId">View Product {{ someOtherId }}</a>
+      - <strong style="background-color: #ffff00;">someOtherId == undefined</strong>, so warn<br>
+      <a ng-href="/products/{{ someOtherId + 5 }}/view" id="someOtherId5">View Product {{ someOtherId + 5 }}</a>
+      - <strong>someOtherId + 5 == 5</strong>, so no warning<br>
+      <div>Warn Count: {{ warnCount }}</div>
+    </div>
+  </file>
+
+  <file name="protractor.js" type="protractor">
+    it('should warn when an expression in the interpolated value is falsy', function() {
+      var id3 = element(by.id('id3'));
+      var id8 = element(by.id('id8'));
+      var someOther = element(by.id('someOtherId'));
+      var someOther5 = element(by.id('someOtherId5'));
+
+      expect(id3.getText()).toEqual('View Product 3');
+      expect(id3.getAttribute('href')).toContain('/products/3/view');
+
+      expect(id8.getText()).toEqual('View Product 8');
+      expect(id8.getAttribute('href')).toContain('/products/8/view');
+
+      expect(someOther.getText()).toEqual('View Product');
+      expect(someOther.getAttribute('href')).toContain('/products//view');
+
+      expect(someOther5.getText()).toEqual('View Product 5');
+      expect(someOther5.getAttribute('href')).toContain('/products/5/view');
+
+      expect(element(by.binding('warnCount')).getText()).toEqual('Warn Count: 1');
+    });
+  </file>
+</example>
+
+### Filter Decorator Example
+
+Let's say we have created an app that uses the default format for many of our `Date` filters. Suddenly requirements have
+changed (that never happens) and we need all of our default dates to be `'shortDate'` instead of `'mediumDate'`.
+
+<example module="filterDecorator" name="filter-decorator">
+  <file name="script.js">
+    angular.module('filterDecorator', []).
+
+      controller('Ctrl', ['$scope', function ($scope) {
+        $scope.genesis = new Date(2010, 0, 5);
+        $scope.ngConf = new Date(2016, 4, 4);
+      }]).
+
+      config(['$provide', function($provide) {
+
+        $provide.decorator('dateFilter', [
+          '$delegate',
+          function dateDecorator($delegate) {
+
+            // store the original filter
+            var originalFilter = $delegate;
+
+            // return our filter
+            return shortDateDefault;
+
+            // shortDateDefault sets the format to shortDate if it is falsy
+            function shortDateDefault(date, format, timezone) {
+              if (!format) format = 'shortDate';
+
+              // return the result of the original filter
+              return originalFilter(date, format, timezone);
+            }
+
+          }
+
+        ]);
+
+      }]);
+  </file>
+
+  <file name="index.html">
+    <div ng-controller="Ctrl">
+      <div id="genesis">Initial Commit default to short date: {{ genesis | date }}</div>
+      <div>ng-conf 2016 default short date: {{ ngConf | date }}</div>
+      <div id="ngConf">ng-conf 2016 with full date format: {{ ngConf | date:'fullDate' }}</div>
+    </div>
+  </file>
+
+  <file name="protractor.js" type="protractor">
+    it('should default date filter to short date format', function() {
+      expect(element(by.id('genesis')).getText())
+        .toMatch(/Initial Commit default to short date: \d{1,2}\/\d{1,2}\/\d{2}/);
+    });
+
+    it('should still allow dates to be formatted', function() {
+      expect(element(by.id('ngConf')).getText())
+        .toMatch(/ng-conf 2016 with full date format\: [A-Za-z]+, [A-Za-z]+ \d{1,2}, \d{4}/);
+    });
+  </file>
+</example>

docs/content/guide/expression.ngdoc

@@ -116,9 +116,6 @@ This restriction is intentional. It prevents accidental access to the global sta
 Instead use services like `$window` and `$location` in functions called from expressions. Such services
 provide mockable access to globals.
 
-It is possible to access the context object using the identifier `this` and the locals object using the
-identifier `$locals`.
-
 <example module="expressionExample">
   <file name="index.html">
     <div class="example2" ng-controller="ExampleController">

docs/content/guide/ie.ngdoc

@@ -28,7 +28,4 @@ browsers, but it is up to you to test and decide whether it works for your parti
 To ensure your Angular application works on IE please consider:
 
 1. Use `ng-style` tags instead of `style="{{ someCss }}"`. The latter works in Chrome and Firefox
-   but does not work in Internet Explorer <= 11 (the most recent version at time of writing).
-2. For the `type` attribute of buttons, use `ng-attr-type` tags instead of 
-   `type="{{ someExpression }}"`.  If using the latter, Internet Explorer overwrites the expression
-   with `type="submit"` before Angular has a chance to interpolate it.
+   but does not work in Internet Explorer <= 11 (the most recent version at time of writing).

docs/content/guide/index.ngdoc

@@ -101,7 +101,7 @@ This is a short list of libraries with specific support and documentation for wo
 
 ## Learning Resources
 
-###Books
+### Books
 * [AngularJS: Up and Running](http://www.amazon.com/AngularJS-Running-Enhanced-Productivity-Structured/dp/1491901942) by Brad Green and Shyam Seshadri
 * [Mastering Web App Development](http://www.amazon.com/Mastering-Web-Application-Development-AngularJS/dp/1782161821) by Pawel Kozlowski and Pete Bacon Darwin
 * [AngularJS Directives](http://www.amazon.com/AngularJS-Directives-Alex-Vanston/dp/1783280336) by Alex Vanston
@@ -113,7 +113,7 @@ This is a short list of libraries with specific support and documentation for wo
 * [Responsive Web Design with AngularJS](http://www.amazon.com/Responsive-Design-AngularJS-Sandeep-Kumar/dp/178439842X) by Sandeep Kumar Patel
 * [Professional AngularJS](http://www.amazon.com/Professional-AngularJS-Valeri-Karpov/dp/1118832078/)
 
-###Videos:
+### Videos:
 * [egghead.io](http://egghead.io/)
 * [Angular on YouTube](http://youtube.com/angularjs)
 * [Firebase Foundations for AngularJS](http://blog.watchandcode.com/firebase-foundations/)

docs/content/guide/migration.ngdoc

@@ -3,246 +3,17 @@
 @sortOrder 550
 @description
 
-# Migrating an App to a newer version
-
 Minor version releases in AngularJS introduce several breaking changes that may require changes to your
 application's source code; for instance from 1.0 to 1.2 and from 1.2 to 1.3.
 
-Although we try to avoid breaking changes, there are some cases where it is unavoidable:
+Although we try to avoid breaking changes, there are some cases where it is unavoidable.
 
 * AngularJS has undergone thorough security reviews to make applications safer by default,
 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.
 
-
-
-## Contents
-
-<ul class="nav nav-list">
-  <li>{@link guide/migration#migrating-from-1-4-to-1-5 Migrating from 1.4 to 1.5}</li>
-  <li>{@link guide/migration#migrating-from-1-3-to-1-4 Migrating from 1.3 to 1.4}</li>
-  <li>{@link guide/migration#migrating-from-1-2-to-1-3 Migrating from 1.2 to 1.3}</li>
-  <li>{@link guide/migration#migrating-from-1-0-to-1-2 Migrating from 1.0 to 1.2}</li>
-</ul>
-
-
-
-
-
-## Migrating from 1.4 to 1.5
-
-Angular 1.5 takes a big step towards preparing developers for a smoother transition to Angular 2 in
-the future. Architecturing your applications using components, multi-slot transclusion, one-way
-bindings in isolate scopes, using lifecycle hooks in directive controllers and relying on native ES6
-features (such as classes and arrow functions) are now all possible with Angular 1.5.
-
-
-This release includes numerous bug and security fixes, as well as performance improvements to core
-services, directives, filters and helper functions. Existing applications can start enjoying the
-benefits of such changes in `$compile`, `$parse`, `$animate`, `$animateCss`, `$sanitize`, `ngOptions`,
-`currencyFilter`, `numberFilter`, `copy()` (to name but a few) without any change in code.
-
-New features have been added to more than a dozen services, directives and filters across 8 modules.
-Among them, a few stand out:
-
-* `angular.component()`: Introducing "components", a special sort of directive that are easy to
-  configure and promote best practices (plus can bring Angular 1 applications closer to Angular 2's
-  style of architecture).
-* Multi-slot transclusion: Enabling the design of more powerful and complex UI elements with a much
-  simpler configuration and reduced boilerplate.
-* `$onInit` lifecycle hook: Introducing a new lifecycle hook for directive controllers, called after
-  all required controllers have been constructed. This enables access to required controllers from
-  a directive's controller, without having to rely on the linking function.
-* `ngAnimateSwap`: A new directive in `ngAnimate`, making it super easy to create rotating
-  banner-like components.
-* Testing helpers: New helper functions in `ngMock`, simplifying testing for animations, component
-  controllers and routing.
-
-Also, notable is the improved support for ES6 features, such as classes and arrow functions. These
-features are now more reliably detected and correctly handled within the core.
-
-
-All this goodness doesn't come without a price, though. Below is a list of breaking changes (grouped
-by module) that need to be taken into account while migrating from 1.4. Fortunately, the majority of
-them should have a pretty low impact on most applications.
-
-
-### Core
-
-We tried to keep the breaking changes inside the core components to a bare minimum. Still, a few of
-them were unavoidable.
-
-#### Services (`$parse`)
-
-Due to [0ea53503](https://github.com/angular/angular.js/commit/0ea535035a3a1a992948490c3533bffb83235052),
-a new special property, `$locals`, will be available for accessing the locals from an expression.
-This is a breaking change, only if a `$locals` property does already exist (and needs to be
-referenced) either on the `scope` or on the `locals` object. Your expressions should be changed to
-access such existing properties as `this.$locals` and `$locals.$locals` respectively.
-
-
-#### Directives (`ngOptions`)
-
-A fair amount of work has been put into the `ngOptions` directive, fixing bugs and corner-cases and
-neutralizing browser quirks. A couple of breaking changes were made in the process:
-
-Due to [b71d7c3f](https://github.com/angular/angular.js/commit/b71d7c3f3c04e65b02d88b33c22dd90ae3cdfc27),
-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 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`.
-
-Due to [ded25187](https://github.com/angular/angular.js/commit/ded2518756d4409fdfda0d4af243f2125bea01b5),
-`ngOptions` now explicitly requires `ngModel` on the same element, thus an error will be thrown if
-`ngModel` is not found. Previously, `ngOptions` would silently fail, which could lead to
-hard-to-debug errors.
-This is not expected to have any significant impact on applications, since `ngOptions` didn't work
-without `ngModel` before either. The main difference is that now it will fail with a more
-informative error message.
-
-
-#### Filters (`orderBy`)
-
-Due to [2a85a634](https://github.com/angular/angular.js/commit/2a85a634f86c84f15b411ce009a3515fca7ba580),
-passing a non-array-like value (other than `undefined` or `null`) through the `orderBy` filter will
-throw an error. Previously, the input was returned unchanged, which could lead to hard-to-spot bugs
-and was not consistent with other filters (e.g. `filter`).
-Objects considered array-like include: arrays, array subclasses, strings, NodeLists,
-jqLite/jQuery collections
-
-
-### ngAria
-
-Due to [d06431e](https://github.com/angular/angular.js/commit/d06431e5309bb0125588877451dc79b935808134),
-the `ngAria`-enhanced directives (e.g. `ngModel`, `ngDisabled` etc) will not apply ARIA attributes
-to native inputs, unless necessary. Previously, ARIA attributes were always applied to native
-inputs, despite this being unnecessary in most cases.
-In the context of `ngAria`, elements considered "native inputs" include:
-`<a>`, `<button>`, `<details>`, `<input>`, `<select>`, `<summary>`, `<textarea>`
-
-This change will not affect the accessibility of your applications (since native inputs are
-accessible by default), but if you relied on ARIA attributes being present on native inputs (for
-whatever reason), you'll have to add and update them manually.
-
-Additionally, the `aria-multiline` attribute, which was previously added to elements with a `type`
-or `role` of `textbox`, will not be added anymore, since there is no way `ngAria` can tell if the
-textbox element is multiline or not.
-If you relied on `aria-multiline="true"` being automatically added by `ngAria`, you need to apply it
-yourself. E.g. change your code from `<div role="textbox" ng-model="..." ...>` to
-`<div role="textbox" ng-model="..." ... aria-multiline="true">`.
-
-
-### ngMessages (`ngMessage`)
-
-Due to [4971ef12](https://github.com/angular/angular.js/commit/4971ef12d4c2c268cb8d26f90385dc96eba19db8),
-the `ngMessage` directive is now compiled with a priority of 1, which means directives on the same
-element as `ngMessage` with a priority lower than 1 will be applied when `ngMessage` calls its
-`$transclude` function. Previously, they were applied during the initial compile phase and were
-passed the comment element created by the transclusion of `ngMessage`.
-If you have custom directives that relied on the previous behavior, you need to give them a priority
-of 1 or greater.
-
-
-### ngResource (`$resource`)
-
-The `$resource` service underwent a minor internal refactoring to finally solve a long-standing bug
-preventing requests from being cancelled using promises. Due to the nature of `$resource`'s
-configuration, it was not possible to follow the `$http` convention. A new `$cancelRequest()` method
-was introduced instead.
-
-Due to [98528be3](https://github.com/angular/angular.js/commit/98528be311b48269ba0e15ba4e3e2ad9b89693a9),
-using a promise as `timeout` in `$resource` is no longer supported and will log a warning. This is
-hardly expected to affect the behavior of your application, since a promise as `timeout` didn't work
-before either, but it will now warn you explicitly when trying to pass one.
-If you need to be able to cancel pending requests, you can now use the new `$cancelRequest()` that
-will be available on `$resource` instances.
-
-
-### ngRoute (`ngView`)
-
-Due to [983b0598](https://github.com/angular/angular.js/commit/983b0598121a8c5a3a51a30120e114d7e3085d4d),
-a new property will be available on the scope of the route, allowing easy access to the route's
-resolved values from the view's template. The default name for this property is `$resolve`. This is
-a breaking change, only if a `$resolve` property is already available on the scope, in which case
-the existing property will be hidden or overwritten.
-To fix this, you should choose a custom name for this property, that does not collide with other
-properties on the scope, by specifying the `resolveAs` property on the route.
-
-
-### ngSanitize (`$sanitize`, `linky`)
-
-The HTML sanitizer has been re-implemented using inert documents, increasing security, fixing some
-corner-cases that were difficult to handle and reducing its size by about 20% (in terms of loc). In
-order to make it more secure by default, a couple of breaking changes have been introduced:
-
-Due to [181fc567](https://github.com/angular/angular.js/commit/181fc567d873df065f1e84af7225deb70a8d2eb9),
-SVG support in `$sanitize` is now an opt-in feature (i.e. disabled by default), as it could make
-an application vulnerable to click-hijacking attacks. If your application relies on it, you can
-still turn it on with `$sanitizeProvider.enableSvg(true)`, but you extra precautions need to be
-taken in order to keep your application secure. Read the documentation for more information about
-the dangers and ways to mitigate them.
-
-Due to [7a668cdd](https://github.com/angular/angular.js/commit/7a668cdd7d08a7016883eb3c671cbcd586223ae8),
-the `$sanitize` service will now remove instances of the `<use>` tag from the content passed to it.
-This element is used to import external SVG resources, which is a security risk as the `$sanitize`
-service does not have access to the resource in order to sanitize it.
-
-Similarly, due to [234053fc](https://github.com/angular/angular.js/commit/234053fc9ad90e0d05be7e8359c6af66be94c094),
-the `$sanitize` service will now also remove instances of the `usemap` attribute from any elements
-passed to it. This attribute is used to reference another element by `name` or `id`. Since the
-`name` and `id` attributes are already blacklisted, a sanitized `usemap` attribute could only
-reference unsanitized content, which is a security risk.
-
-Due to [98c2db7f](https://github.com/angular/angular.js/commit/98c2db7f9c2d078a408576e722407d518c7ee10a),
-passing a non-string value (other than `undefined` or `null`) through the `linky` filter will throw
-an error. This is not expected to have any significant impact on applications, since the input was
-always assumed to be of type 'string', so passing non-string values never worked correctly anyway.
-The main difference is that now it will fail faster and with a more informative error message.
-
-
-## ngTouch (`ngClick`)
-
-Due to [0dfc1dfe](https://github.com/angular/angular.js/commit/0dfc1dfebf26af7f951f301c4e3848ac46f05d7f),
-the `ngClick` override directive from the `ngTouch` module is **deprecated and disabled by default**.
-This means that on touch-based devices, users might now experience a 300ms delay before a click
-event is fired.
-
-If you rely on this directive, you can still enable it using
-`$touchProvider.ngClickOverrideEnabled()`:
-
-```js
-angular.module('myApp').config(function($touchProvider) {
-  $touchProvider.ngClickOverrideEnabled(true);
-});
-```
-
-Going forward, we recommend using [FastClick](https://github.com/ftlabs/fastclick) or perhaps one of
-the [Angular 3rd party touch-related modules](http://ngmodules.org/tags/touch) that provide similar
-functionality.
-
-Also note that modern browsers already remove the 300ms delay under some circumstances:
-
-- **Chrome and Firefox for Android** remove the 300ms delay when the well-known
-  `<meta name="viewport" content="width=device-width">` is set.
-- **Internet Explorer** removes the delay, when the `touch-action` css property is set to `none` or
-  `manipulation`.
-- Since **iOS 8, Safari** removes the delay on so-called "slow taps".
-
-For more info on the topic, you can take a look at this
-[article by Telerik](http://developer.telerik.com/featured/300-ms-click-delay-ios-8/).
-
-<div class="alert alert-warning">
-  **Note:** This change does **not** affect the `ngSwipe` directive.
-</div>
-
-
-
-
-
-## Migrating from 1.3 to 1.4
+# Migrating from 1.3 to 1.4
 
 Angular 1.4 fixes major animation issues and introduces a new API for `ngCookies`. Further, there
 are changes to `ngMessages`, `$compile`, `ngRepeat`, `ngOptions `and some fixes to core filters:
@@ -266,7 +37,7 @@ relatively straightforward otherwise.
 
 
 
-### Animation (`ngAnimate`)
+## Animation (`ngAnimate`)
 
 Animations in 1.4 have been refactored internally, but the API has stayed much the same. There are, however,
 some breaking changes that need to be addressed when upgrading to 1.4.
@@ -365,9 +136,9 @@ class based animations (animations triggered via ngClass) in order to ensure tha
 
 
 
-### Forms (`ngMessages`, `ngOptions`, `select`)
+## Forms (`ngMessages`, `ngOptions`, `select`)
 
-#### ngMessages
+### ngMessages
 The ngMessages module has also been subject to an internal refactor to allow it to be more flexible
 and compatible with dynamic message data. The `ngMessage` directive now supports a new attribute
 called `ng-message-exp` which will evaluate an expression and will keep track of that expression
@@ -418,7 +189,7 @@ ctrl.getMessages = function($index) {
 }
 ```
 
-#### ngOptions
+### ngOptions
 
 The `ngOptions` directive has also been refactored and as a result some long-standing bugs
 have been fixed. The breaking changes are comparatively minor and should not affect most applications.
@@ -442,7 +213,7 @@ setting the ngOptions attribute expression after the element is compiled, will n
 This worked previously because the ngOptions logic was part of the select directive, while
 it is now implemented in the ngOptions directive itself.
 
-#### select
+### select
 
 Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
 the `select` directive will now use strict comparison of the `ngModel` scope value against `option`
@@ -473,7 +244,6 @@ ngModelCtrl.$formatters.push(function(value) {
 });
 ```
 
-
 ### form
 
 Due to [94533e57](https://github.com/angular/angular.js/commit/94533e570673e6b2eb92073955541fa289aabe02),
@@ -514,9 +284,9 @@ angular.module('myApp').directive('form', function() {
 });
 ```
 
-### Templating (`ngRepeat`, `$compile`)
+## Templating (`ngRepeat`, `$compile`, `ngInclude`)
 
-#### ngRepeat
+### ngRepeat
 
 Due to [c260e738](https://github.com/angular/angular.js/commit/c260e7386391877625eda086480de73e8a0ba921),
 previously, the order of items when using ngRepeat to iterate over object properties was guaranteed to be consistent
@@ -535,7 +305,7 @@ https://github.com/petebacondarwin/angular-toArrayFilter
 or some other mechanism, and then sort them manually in the order you need.
 
 
-#### $compile
+### $compile
 
 Due to [6a38dbfd](https://github.com/angular/angular.js/commit/6a38dbfd3c34c8f9efff503d17eb3cbeb666d422),
 previously, '&' expressions would always set up a function in the isolate scope. Now, if the binding
@@ -546,7 +316,46 @@ returning an object from a controller constructor function will now override the
 controllerAs method will no longer get the this reference, but the returned object.
 
 
-### Cookies (`ngCookies`)
+### ngInclude:
+Due to [3c6e8ce044446735eb2e70d0061db8c6db050289](https://github.com/angular/angular.js/commit/3c6e8ce044446735eb2e70d0061db8c6db050289), the `src` attribute of ngInclude no longer accepts an
+expression that returns the result of `$sce.trustAsResourceUrl`. This will now cause an infinite digest:
+
+Before:
+```html
+<div ng-include="findTemplate('https://example.com/templates/myTemplate.html')"></div>
+```
+
+```js
+$scope.findTemplate = function(templateName) {
+  return $sce.trustAsResourceUrl(templateName);
+};
+```
+
+To migrate, either cache the result of `trustAsResourceUrl()`, or put the template url in the resource
+whitelist in the `config()` function:
+
+After:
+
+```js
+var templateCache = {};
+$scope.findTemplate = function(templateName) {
+  if (!templateCache[templateName]) {
+    templateCache[templateName] = $sce.trustAsResourceUrl(templateName);
+  }
+
+  return templateCache[templateName];
+};
+
+// Alternatively, use `$sceDelegateProvider.resourceUrlWhitelist()`, which means you don't
+// have to use `$sce.trustAsResourceUrl()` at all:
+
+angular.module('myApp', []).config(function($sceDelegateProvider) {
+  $sceDelegateProvider.resourceUrlWhitelist(['self', 'https://example.com/templates/**'])
+});
+```
+
+
+## Cookies (`ngCookies`)
 
 Due to [38fbe3ee](https://github.com/angular/angular.js/commit/38fbe3ee8370fc449b82d80df07b5c2ed2cd5fbe),
 `$cookies` will no longer expose properties that represent the current browser cookie
@@ -583,9 +392,7 @@ has been moved to `$cookies`, to which `$cookieStore` now simply
 delegates calls.
 
 
-
-
-### Server Requests (`$http`)
+## Server Requests (`$http`)
 
 Due to [5da1256](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
 `transformRequest` functions can no longer modify request headers.
@@ -616,11 +423,9 @@ $http.get(url, {
 ```
 
 
+## Filters (`filter`, `limitTo`)
 
-
-### Filters (`filter`, `limitTo`)
-
-#### `filter` filter
+### `filter` filter
 Due to [cea8e751](https://github.com/angular/angular.js/commit/cea8e75144e6910b806b63a6ec2a6d118316fddd),
 the `filter` filter will throw an error when used with a non-array. Beforehand it would silently
 return an empty array.
@@ -628,18 +433,16 @@ return an empty array.
 If necessary, this can be worked around by converting an object to an array,
 using a filter such as https://github.com/petebacondarwin/angular-toArrayFilter.
 
-#### `limitTo` filter
+### `limitTo` filter
 Due to [a3c3bf33](https://github.com/angular/angular.js/commit/a3c3bf3332e5685dc319c46faef882cb6ac246e1),
 the limitTo filter has changed behavior when the provided limit value is invalid.
 Now, instead of returning empty object/array, it returns unchanged input.
 
 
 
+# Migrating from 1.2 to 1.3
 
-
-## Migrating from 1.2 to 1.3
-
-### Controllers
+## Controllers
 
 Due to [3f2232b5](https://github.com/angular/angular.js/commit/3f2232b5a181512fac23775b1df4a6ebda67d018),
 `$controller` will no longer look for controllers on `window`.
@@ -677,7 +480,7 @@ angular.module('myModule').config(['$controllerProvider', function($controllerPr
 }]);
 ```
 
-### Angular Expression Parsing (`$parse` + `$interpolate`)
+## Angular Expression Parsing (`$parse` + `$interpolate`)
 
 - due to [77ada4c8](https://github.com/angular/angular.js/commit/77ada4c82d6b8fc6d977c26f3cdb48c2f5fbe5a5),
 
@@ -735,7 +538,7 @@ expression parser; there are six of them: false, null, undefined, NaN, 0 and "".
 
 
 
-### Miscellaneous Angular helpers
+## Miscellaneous Angular helpers
 
 - **Angular.copy:** due to [b59b04f9](https://github.com/angular/angular.js/commit/b59b04f98a0b59eead53f6a53391ce1bbcbe9b57),
 
@@ -766,14 +569,15 @@ This change also makes our forEach behave more like Array#forEach.
 
 
 - **angular.toJson:** due to [c054288c](https://github.com/angular/angular.js/commit/c054288c9722875e3595e6e6162193e0fb67a251),
-  `toJson()` will no longer strip properties starting with a single `$`. If you relied on
-`toJson()`'s stripping these types of properties before, you will have to do it manually now.
-It will still strip properties starting with `$$` though.
+
+If you expected `toJson` to strip these types of properties before, you will have to
+manually do this yourself now.
 
 
 
 
-### jqLite / JQuery
+
+## jqLite / JQuery
 
 - **jqLite:** due to [a196c8bc](https://github.com/angular/angular.js/commit/a196c8bca82a28c08896d31f1863cf4ecd11401c),
   previously it was possible to set jqLite data on Text/Comment
@@ -789,7 +593,7 @@ jQuery. We don't expect that app code actually depends on this accidental featur
 
 
 
-### Angular HTML Compiler (`$compile`)
+## Angular HTML Compiler (`$compile`)
 
 
 - due to [2ee29c5d](https://github.com/angular/angular.js/commit/2ee29c5da81ffacdc1cabb438f5d125d5e116cb9),
@@ -886,7 +690,7 @@ link: function(scope, element, attr) {
 
 
 
-### Forms, Inputs and ngModel
+## Forms, Inputs and ngModel
 
 - due to [1be9bb9d](https://github.com/angular/angular.js/commit/1be9bb9d3527e0758350c4f7417a4228d8571440),
 
@@ -966,7 +770,7 @@ $scope.resetWithCancel = function (e) {
   See [c90cefe1614](https://github.com/angular/angular.js/commit/c90cefe16142d973a123e945fc9058e8a874c357)
 
 
-### Scopes and Digests (`$scope`)
+## Scopes and Digests (`$scope`)
 
 - due to [8c6a8171](https://github.com/angular/angular.js/commit/8c6a8171f9bdaa5cdabc0cc3f7d3ce10af7b434d),
   Scope#$id is now of type number rather than string. Since the
@@ -986,7 +790,7 @@ anyone.
 
 
 
-### Server Requests (`$http`, `$resource`)
+## Server Requests (`$http`, `$resource`)
 - **$http:** due to [ad4336f9](https://github.com/angular/angular.js/commit/ad4336f9359a073e272930f8f9bcd36587a8648f),
 
 
@@ -1053,7 +857,7 @@ More details on the new interceptors API (which has been around as of v1.1.4) ca
 
 
 
-### Modules and Injector (`$inject`)
+## Modules and Injector (`$inject`)
 
 - due to [c0b4e2db](https://github.com/angular/angular.js/commit/c0b4e2db9cbc8bc3164cedc4646145d3ab72536e),
 
@@ -1095,7 +899,7 @@ app. This is no longer possible within a single module.
 
 
 
-### Animation (`ngAnimate`)
+## Animation (`ngAnimate`)
 
 
 - due to [1cb8584e](https://github.com/angular/angular.js/commit/1cb8584e8490ecdb1b410a8846c4478c6c2c0e53),
@@ -1117,7 +921,7 @@ to:
 
   Any class-based animation code that makes use of transitions
 and uses the setup CSS classes (such as class-add and class-remove) must now
-provide an empty transition value to ensure that its styling is applied right
+provide a empty transition value to ensure that its styling is applied right
 away. In other words if your animation code is expecting any styling to be
 applied that is defined in the setup class then it will not be applied
 "instantly" unless a `transition:0s none` value is present in the styling
@@ -1148,7 +952,7 @@ After:
 Please view the documentation for ngAnimate for more info.
 
 
-### Testing
+## Testing
 
 - due to [85880a64](https://github.com/angular/angular.js/commit/85880a64900fa22a61feb926bf52de0965332ca5), some deprecated features of
 Protractor tests no longer work.
@@ -1187,7 +991,7 @@ or simply use:
     var el = element(by.repeater('foo in foos').row(2))
 
 
-### Internet Explorer 8
+## Internet Explorer 8
 
 - due to [eaa1d00b](https://github.com/angular/angular.js/commit/eaa1d00b24008f590b95ad099241b4003688cdda),
   As communicated before, IE8 is no longer supported.
@@ -1197,7 +1001,7 @@ or simply use:
 
 
 
-## Migrating from 1.0 to 1.2
+# Migrating from 1.0 to 1.2
 
 
 <div class="alert alert-warning">
@@ -1240,7 +1044,7 @@ below should still apply, but you may want to consult the
 </ul>
 
 
-### ngRoute has been moved into its own module
+## ngRoute has been moved into its own module
 
 Just like `ngResource`, `ngRoute` is now its own module.
 
@@ -1271,7 +1075,7 @@ var myApp = angular.module('myApp', ['ngRoute', 'someOtherModule']);
 See [5599b55b](https://github.com/angular/angular.js/commit/5599b55b04788c2e327d7551a4a699d75516dd21).
 
 
-### Templates no longer automatically unwrap promises
+## Templates no longer automatically unwrap promises
 
 `$parse` and templates in general will no longer automatically unwrap promises.
 
@@ -1305,7 +1109,7 @@ See [5dc35b52](https://github.com/angular/angular.js/commit/5dc35b527b3c99f6544b
 [b6a37d11](https://github.com/angular/angular.js/commit/b6a37d112b3e1478f4d14a5f82faabf700443748).
 
 
-### Syntax for named wildcard parameters changed in `$route`
+## Syntax for named wildcard parameters changed in `$route`
 
 To migrate the code, follow the example below. Here, `*highlight` becomes `:highlight*`
 
@@ -1326,7 +1130,7 @@ $routeProvider.when('/Book1/:book/Chapter/:chapter/:highlight*/edit',
 See [04cebcc1](https://github.com/angular/angular.js/commit/04cebcc133c8b433a3ac5f72ed19f3631778142b).
 
 
-### You can only bind one expression to `*[src]`, `*[ng-src]` or `action`
+## You can only bind one expression to `*[src]`, `*[ng-src]` or `action`
 
 With the exception of `<a>` and `<img>` elements, you cannot bind more than one expression to the
 `src` or `action` attribute of elements.
@@ -1401,7 +1205,7 @@ scope.getIframeSrc = function() {
 See [38deedd6](https://github.com/angular/angular.js/commit/38deedd6e3d806eb8262bb43f26d47245f6c2739).
 
 
-### Interpolations inside DOM event handlers are now disallowed
+## Interpolations inside DOM event handlers are now disallowed
 
 DOM event handlers execute arbitrary Javascript code. Using an interpolation for such handlers
 means that the interpolated value is a JS string that is evaluated. Storing or generating such
@@ -1428,7 +1232,7 @@ HTML: <div ng-click="foo()">
 See [39841f2e](https://github.com/angular/angular.js/commit/39841f2ec9b17b3b2920fd1eb548d444251f4f56).
 
 
-### Directives cannot end with -start or -end
+## Directives cannot end with -start or -end
 
 This change was necessary to enable multi-element directives. The best fix is to rename existing
 directives so that they don't end with these suffixes.
@@ -1436,7 +1240,7 @@ directives so that they don't end with these suffixes.
 See [e46100f7](https://github.com/angular/angular.js/commit/e46100f7097d9a8f174bdb9e15d4c6098395c3f2).
 
 
-### In $q, promise.always has been renamed promise.finally
+## In $q, promise.always has been renamed promise.finally
 
 The reason for this change is to align `$q` with the [Q promise
 library](https://github.com/kriskowal/q), despite the fact that this makes it a bit more difficult
@@ -1468,7 +1272,7 @@ $http.get('/foo')['finally'](doSomething);
 See [f078762d](https://github.com/angular/angular.js/commit/f078762d48d0d5d9796dcdf2cb0241198677582c).
 
 
-### ngMobile is now ngTouch
+## ngMobile is now ngTouch
 
 Many touch-enabled devices are not mobile devices, so we decided to rename this module to better
 reflect its concerns.
@@ -1479,7 +1283,7 @@ To migrate, replace all references to `ngMobile` with `ngTouch` and `angular-mob
 See [94ec84e7](https://github.com/angular/angular.js/commit/94ec84e7b9c89358dc00e4039009af9e287bbd05).
 
 
-### resource.$then has been removed
+## resource.$then has been removed
 
 Resource instances do not have a `$then` function anymore. Use the `$promise.then` instead.
 
@@ -1498,7 +1302,7 @@ Resource.query().$promise.then(callback);
 See [05772e15](https://github.com/angular/angular.js/commit/05772e15fbecfdc63d4977e2e8839d8b95d6a92d).
 
 
-### Resource methods return the promise
+## Resource methods return the promise
 
 Methods of a resource instance return the promise rather than the instance itself.
 
@@ -1518,7 +1322,7 @@ resource.chaining = true;
 See [05772e15](https://github.com/angular/angular.js/commit/05772e15fbecfdc63d4977e2e8839d8b95d6a92d).
 
 
-### Resource promises are resolved with the resource instance
+## Resource promises are resolved with the resource instance
 
 On success, the resource promise is resolved with the resource instance rather than HTTP response object.
 
@@ -1549,7 +1353,7 @@ var Resource = $resource('/url', {}, {
 See [05772e15](https://github.com/angular/angular.js/commit/05772e15fbecfdc63d4977e2e8839d8b95d6a92d).
 
 
-### $location.search supports multiple keys
+## $location.search supports multiple keys
 
 {@link ng.$location#search `$location.search`} now supports multiple keys with the
 same value provided that the values are stored in an array.
@@ -1566,7 +1370,7 @@ passing it to `$location`.
 See [80739409](https://github.com/angular/angular.js/commit/807394095b991357225a03d5fed81fea5c9a1abe).
 
 
-### ngBindHtmlUnsafe has been removed and replaced by ngBindHtml
+## ngBindHtmlUnsafe has been removed and replaced by ngBindHtml
 
 `ngBindHtml` provides `ngBindHtmlUnsafe` like
 behavior (evaluate an expression and innerHTML the result into the DOM) when bound to the result
@@ -1582,7 +1386,7 @@ trusted.
 See [dae69473](https://github.com/angular/angular.js/commit/dae694739b9581bea5dbc53522ec00d87b26ae55).
 
 
-### Form names that are expressions are evaluated
+## Form names that are expressions are evaluated
 
 If you have form names that will evaluate as an expression:
 
@@ -1614,7 +1418,7 @@ Supporting the previous behavior offers no benefit.
 See [8ea802a1](https://github.com/angular/angular.js/commit/8ea802a1d23ad8ecacab892a3a451a308d9c39d7).
 
 
-### hasOwnProperty disallowed as an input name
+## hasOwnProperty disallowed as an input name
 
 Inputs with name equal to `hasOwnProperty` are not allowed inside form or ngForm directives.
 
@@ -1625,7 +1429,7 @@ and bad practice. To migrate, change your input name.
 See [7a586e5c](https://github.com/angular/angular.js/commit/7a586e5c19f3d1ecc3fefef084ce992072ee7f60).
 
 
-### Directives: Order of postLink functions reversed
+## Directives: Order of postLink functions reversed
 
 The order of postLink fn is now mirror opposite of the order in which corresponding preLinking and compile functions execute.
 
@@ -1681,7 +1485,7 @@ attribute interpolation directive was adjusted.
 See [31f190d4](https://github.com/angular/angular.js/commit/31f190d4d53921d32253ba80d9ebe57d6c1de82b).
 
 
-### Directive priority
+## Directive priority
 
 the priority of ngRepeat, ngSwitchWhen, ngIf, ngInclude and ngView has changed. This could affect directives that explicitly specify their priority.
 
@@ -1699,7 +1503,7 @@ ngView           | 1000         | 400
 See [b7af76b4](https://github.com/angular/angular.js/commit/b7af76b4c5aa77648cc1bfd49935b48583419023).
 
 
-### ngScenario
+## ngScenario
 
 browserTrigger now uses an eventData object instead of direct parameters for mouse events.
 To migrate, place the `keys`,`x` and `y` parameters inside of an object and place that as the
@@ -1708,7 +1512,7 @@ third parameter for the browserTrigger function.
 See [28f56a38](https://github.com/angular/angular.js/commit/28f56a383e9d1ff378e3568a3039e941c7ffb1d8).
 
 
-### ngInclude and ngView replace its entire element on update
+## ngInclude and ngView replace its entire element on update
 
 Previously `ngInclude` and `ngView` only updated its element's content. Now these directives will
 recreate the element every time a new content is included.
@@ -1720,7 +1524,7 @@ See [7d69d52a](https://github.com/angular/angular.js/commit/7d69d52acff8578e0f7d
 [aa2133ad](https://github.com/angular/angular.js/commit/aa2133ad818d2e5c27cbd3933061797096356c8a).
 
 
-### URLs are now sanitized against a whitelist
+## URLs are now sanitized against a whitelist
 
 A whitelist configured via `$compileProvider` can be used to configure what URLs are considered safe.
 By default all common protocol prefixes are whitelisted including `data:` URIs with mime types `image/*`.
@@ -1730,7 +1534,7 @@ See [1adf29af](https://github.com/angular/angular.js/commit/1adf29af13890d612868
 [3e39ac7e](https://github.com/angular/angular.js/commit/3e39ac7e1b10d4812a44dad2f959a93361cd823b).
 
 
-### Isolate scope only exposed to directives with `scope` property
+## Isolate scope only exposed to directives with `scope` property
 
 If you declare a scope option on a directive, that directive will have an
 [isolate scope](https://github.com/angular/angular.js/wiki/Understanding-Scopes). In Angular 1.0, if a
@@ -1803,7 +1607,7 @@ See [909cabd3](https://github.com/angular/angular.js/commit/909cabd36d779598763c
 [#2500](https://github.com/angular/angular.js/issues/2500).
 
 
-### Change to interpolation priority
+## Change to interpolation priority
 
 Previously, the interpolation priority was `-100` in 1.2.0-rc.2, and `100` before 1.2.0-rc.2.
 Before this change the binding was setup in the post-linking phase.
@@ -1816,7 +1620,7 @@ See [79223eae](https://github.com/angular/angular.js/commit/79223eae502283889334
 [#4528](https://github.com/angular/angular.js/issues/4528), and
 [#4649](https://github.com/angular/angular.js/issues/4649)
 
-### Underscore-prefixed/suffixed properties are non-bindable
+## Underscore-prefixed/suffixed properties are non-bindable
 
 <div class="alert alert-info">
 <p>**Reverted**: This breaking change has been reverted in 1.2.1, and so can be ignored if you're using **version 1.2.1 or higher**</p>
@@ -1855,7 +1659,7 @@ are actually needed by the expressions.
 See [3d6a89e8](https://github.com/angular/angular.js/commit/3d6a89e8888b14ae5cb5640464e12b7811853c7e).
 
 
-### You cannot bind to select[multiple]
+## You cannot bind to select[multiple]
 
 Switching between `select[single]` and `select[multiple]` has always been odd due to browser quirks.
 This feature never worked with two-way data-binding so it's not expected that anyone is using it.
@@ -1865,7 +1669,7 @@ If you are interested in properly adding this feature, please submit a pull requ
 See [d87fa004](https://github.com/angular/angular.js/commit/d87fa0042375b025b98c40bff05e5f42c00af114).
 
 
-### Uncommon region-specific local files were removed from i18n
+## Uncommon region-specific local files were removed from i18n
 
 AngularJS uses the Google Closure library's locale files. The following locales were removed from
 Closure, so Angular is not able to continue to support them:
@@ -1881,7 +1685,7 @@ load and use your copy of the locale file provided that you maintain it yourself
 
 See [6382e21f](https://github.com/angular/angular.js/commit/6382e21fb28541a2484ac1a241d41cf9fbbe9d2c).
 
-### Services can now return functions
+## Services can now return functions
 
 Previously, the service constructor only returned objects regardless of whether a function was returned.
 

docs/content/guide/security.ngdoc

@@ -9,27 +9,6 @@ This document explains some of AngularJS's security features and best practices
 keep in mind as you build your application.
 
 
-## Reporting a security issue
-
-Email us at [security@angularjs.org](mailto:security@angularjs.org) to report any potential
-security issues in AngularJS.
-
-Please keep in mind the points below about Angular's expression language.
-
-
-## Use the latest AngularJS possible
-
-Like any software library, it is critical to keep AngularJS up to date. Please track the
-[CHANGELOG](https://github.com/angular/angular.js/blob/master/CHANGELOG.md) and make sure you are aware
-of upcoming security patches and other updates.
-
-Be ready to update rapidly when new security-centric patches are available.
-
-Those that stray from Angular standards (such as modifying Angular's core) may have difficulty updating,
-so keeping to AngularJS standards is not just a functionality issue, it's also critical in order to
-facilitate rapid security updates.
-
-
 ## Expression Sandboxing
 
 AngularJS's expressions are sandboxed not for security reasons, but instead to maintain a proper
@@ -46,8 +25,7 @@ But if an attacker can change arbitrary HTML templates, there's nothing stopping
 <script>somethingEvil();</script>
 ```
 
-**It's better to design your application in such a way that users cannot change client-side templates.**
-
+It's better to design your application in such a way that users cannot change client-side templates.
 For instance:
 
 * Do not mix client and server templates
@@ -55,8 +33,7 @@ For instance:
 * Do not run user input through `$scope.$eval`
 * Consider using {@link ng.directive:ngCsp CSP} (but don't rely only on CSP)
 
-
-### Mixing client-side and server-side templates
+## Mixing client-side and server-side templates
 
 In general, we recommend against this because it can create unintended XSS vectors.
 
@@ -64,62 +41,20 @@ However, it's ok to mix server-side templating in the bootstrap template (`index
 as user input cannot be used on the server to output html that would then be processed by Angular
 in a way that would allow for arbitrary code execution.
 
-**For instance, you can use server-side templating to dynamically generate CSS, URLs, etc, but not
-for generating templates that are bootstrapped/compiled by Angular.**
+For instance, you can use server-side templating to dynamically generate CSS, URLs, etc, but not
+for generating templates that are bootstrapped/compiled by Angular.
 
 
-## HTTP Requests
+## Reporting a security issue
 
-Whenever your application makes requests to a server there are potential security issues that need
-to be blocked. Both server and the client must cooperate in order to eliminate these threats.
-Angular comes pre-configured with strategies that address these issues, but for this to work backend
-server cooperation is required.
+Email us at [security@angularjs.org](mailto:security@angularjs.org) to report any potential
+security issues in AngularJS.
 
+Please keep in mind the above points about Angular's expression language.
 
-### Cross Site Request Forgery (XSRF/CSRF)
-
-Protection from XSRF is provided by using the double-submit cookie defense pattern.
-For more information please visit {@link $http#cross-site-request-forgery-xsrf-protection XSRF protection}.
-
-### JSON Hijacking Protection
-
-Protection from JSON Hijacking is provided if the server prefixes all JSON requests with following string `")]}',\n"`.
-Angular will automatically strip the prefix before processing it as JSON.
-For more information please visit {@link $http#json-vulnerability-protection JSON Hijacking Protection}.
-
-
-## Strict Contextual Escaping
-
-Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain contexts to require
-a value that is marked as safe to use for that context.
-
-This mode is implemented by the {@link $sce} service and various core directives.
-
-One example of such a context is rendering arbitrary content via the {@link ngBindHtml} directive. If the content is
-provided by a user there is a chance of Cross Site Scripting (XSS) attacks. The {@link ngBindHtml} directive will not
-render content that is not marked as safe by {@link $sce}. The {@link ngSanitize} module can be used to clean such
-user provided content and mark the content as safe.
-
-**Be aware that marking untrusted data as safe via calls to {@link $sce#trustAsHtml `$sce.trustAsHtml`}, etc is
-dangerous and will lead to Cross Site Scripting exploits.**
-
-For more information please visit {@link $sce} and {@link ngSanitize.$sanitize}.
-
-## Using Local Caches
-
-There are various places that the browser can store (or cache) data. Within Angular there are objects created by
-the {@link $cacheFactory}. These objects, such as {@link $templateCache} are used to store and retrieve data,
-primarily used by {@link $http} and the {@link script} directive to cache templates and other data.
-
-Similarly the browser itself offers `localStorage` and `sessionStorage` objects for caching data.
-
-**Attackers with local access can retrieve sensitive data from this cache even when users are not authenticated.**
-
-For instance in a long running Single Page Application (SPA), one user may "log out", but then another user
-may access the application without refreshing, in which case all the cached data is still available.
-
-For more information please visit [Web Storage Security](https://www.whitehatsec.com/blog/web-storage-security/).
 
 ## See also
 
 * {@link ng.directive:ngCsp Content Security Policy}
+* {@link ng.$sce Strict Contextual Escaping}
+* {@link ngSanitize.$sanitize $sanitize}

docs/content/guide/services.ngdoc

@@ -43,7 +43,7 @@ subsystem takes care of the rest.
   <file name="script.js">
     angular.
      module('myServiceModule', []).
-      controller('MyController', ['$scope', 'notify', function ($scope, notify) {
+      controller('MyController', ['$scope','notify', function ($scope, notify) {
         $scope.callNotify = function(msg) {
           notify(msg);
         };

docs/content/guide/unit-testing.ngdoc

@@ -6,7 +6,7 @@
 JavaScript is a dynamically typed language which comes with great power of expression, but it also
 comes with almost no help from the compiler. For this reason we feel very strongly that any code
 written in JavaScript needs to come with a strong set of tests. We have built many features into
-Angular which make testing your Angular applications easy. With Angular, there is no excuse for not testing.
+Angular which makes testing your Angular applications easy. So there is no excuse for not testing.
 
 ## Separation of Concerns
 
@@ -20,13 +20,13 @@ related pieces such as the DOM elements, or making any XHR calls to fetch the da
 
 While this may seem obvious it can be very difficult to call an individual function on a
 typical project. The reason is that the developers often mix concerns resulting in a
-piece of code which does everything. It makes an XHR request, it sorts the response data, and then it
+piece of code which does everything. It makes an XHR request, it sorts the response data and then it
 manipulates the DOM.
 
-With Angular, we try to make it easy for you to do the right thing. For your XHR requests, we
-provide dependency injection, so your requests can be simulated. For the DOM, we abstract it, so you can
-test your model without having to manipulate the DOM directly. Your tests can then
-assert that the data has been sorted without having to create or look at the state of the DOM or to
+With Angular we try to make it easy for you to do the right thing, and so we
+provide dependency injection for your XHR requests, which can be mocked, and we provide abstractions which
+allow you to test your model without having to resort to manipulating the DOM. The test can then
+assert that the data has been sorted without having to create or look at the state of the DOM or
 wait for any XHR requests to return data. The individual sort function can be tested in isolation.
 
 ## With great power comes great responsibility
@@ -430,50 +430,5 @@ If your directive uses `templateUrl`, consider using
 to pre-compile HTML templates and thus avoid having to load them over HTTP during test execution.
 Otherwise you may run into issues if the test directory hierarchy differs from the application's.
 
-## Testing Promises
-
-When testing promises, it's important to know that the resolution of promises is tied to the {@link ng.$rootScope.Scope#$digest digest cycle}.
-That means a promise's `then`, `catch` and `finally` callback functions are only called after a digest has run.
-In tests, you can trigger a digest by calling a scope's {@link ng.$rootScope.Scope#$apply `$apply` function}.
-If you don't have a scope in your test, you can inject the {@link ng.$rootScope $rootScope} and call `$apply` on it.
-There is also an example of testing promises in the {@link ng.$q#testing `$q` service documentation}.
-
-## Using `beforeAll()`
-
-Jasmine's `beforeAll()` and mocha's `before()` hooks are often useful for sharing test setup - either to reduce test run-time or simply to make for more focussed test cases.
-
-By default, ngMock will create an injector per test case to ensure your tests do not affect each other. However, if we want to use `beforeAll()`, ngMock will have to create the injector before any test cases are run, and share that injector through all the cases for that `describe`. That is where {@link angular.mock.module.sharedInjector module.sharedInjector()} comes in. When it's called within a `describe` block, a single injector is shared between all hooks and test cases run in that block.
-
-In the example below we are testing a service that takes a long time to generate its answer. To avoid having all of the assertions we want to write in a single test case, {@link angular.mock.module.sharedInjector module.sharedInjector()} and Jasmine's `beforeAll()` are used to run the service only once. The test cases then all make assertions about the properties added to the service instance.
-
-```javascript
-describe("Deep Thought", function() {
-
-  module.sharedInjector();
-
-  beforeAll(module("UltimateQuestion"));
-
-  beforeAll(inject(function(DeepThought) {
-    expect(DeepThought.answer).toBeUndefined();
-    DeepThought.generateAnswer();
-  }));
-
-  it("has calculated the answer correctly", inject(function(DeepThought) {
-    // Because of sharedInjector, we have access to the instance of the DeepThought service 
-    // that was provided to the beforeAll() hook. Therefore we can test the generated answer
-    expect(DeepThought.answer).toBe(42);
-  }));
-
-  it("has calculated the answer within the expected time", inject(function(DeepThought) {
-    expect(DeepThought.runTimeMillennia).toBeLessThan(8000);
-  }));
-
-  it("has double checked the answer", inject(function(DeepThought) {
-    expect(DeepThought.absolutelySureItIsTheRightAnswer).toBe(true);
-  }));
-
-});
-```
-
 ## Sample project
 See the [angular-seed](https://github.com/angular/angular-seed) project for an example.

docs/content/misc/started.ngdoc

@@ -16,9 +16,9 @@ becoming an Angular expert.
    starter app with a directory layout, test harness, and scripts to begin building your application.
 
 
-# Further Steps
+#Further Steps
 
-## Watch Videos
+##Watch Videos
 
 If you haven’t had a chance to watch the videos from the homepage, please check out:
 
@@ -29,13 +29,13 @@ If you haven’t had a chance to watch the videos from the homepage, please chec
 And visit our [YouTube channel](http://www.youtube.com/user/angularjs) for more AngularJS video presentations and
 tutorials.
 
-## Subscribe
+##Subscribe
 
 * Subscribe to the [mailing list](http://groups.google.com/forum/?fromgroups#!forum/angular).  Ask questions here!
 * Follow us on [Twitter](https://twitter.com/intent/follow?original_referer=http%3A%2F%2Fangularjs.org%2F&region=follow_link&screen_name=angularjs&source=followbutton&variant=2.0)
 * Add us to your circles on [Google+](https://plus.google.com/110323587230527980117/posts)
 
-## Read more
+##Read more
 
 The AngularJS documentation includes the {@link guide/index Developer Guide} covering concepts and the
 {@link ./api API Reference} for syntax and usage.

docs/content/tutorial/index.ngdoc

@@ -5,6 +5,22 @@
 
 # PhoneCat Tutorial App
 
+<div class="alert alert-danger">
+  <p>
+    This version of the tutorial is deprecated and no longer maintained. You can find the most
+    recent version of the tutorial at https://docs.angularjs.org/tutorial/.
+  </p>
+  <p>
+    It is recommended to use the latest tutorial version for the following reasons:
+    <ul>
+      <li>It showcases features introduced in AngularJS v1.5+</li>
+      <li>It follows modern best practices in terms of architecture and code organization</li>
+      <li>It has more up-to-date dependencies and tools</li>
+      <li>It is actively maintained</li>
+    </ul>
+  </p>
+</div>
+
 A great way to get introduced to AngularJS is to work through this tutorial, which walks you through
 the construction of an AngularJS web app. The app you will build is a catalog that displays a list
 of Android devices, lets you filter the list to see only devices that interest you, and then view
@@ -73,7 +89,7 @@ Clone the [angular-phonecat repository][angular-phonecat] located at GitHub by r
 command:
 
 ```
-git clone --depth=14 https://github.com/angular/angular-phonecat.git
+git clone --depth=14 --branch=1.4-snapshot https://github.com/angular/angular-phonecat.git
 ```
 
 This command creates the `angular-phonecat` directory in your current directory.
@@ -82,6 +98,11 @@ This command creates the `angular-phonecat` directory in your current directory.
 download much smaller and faster.
 </div>
 
+<div class="alert alert-info">
+  The `--branch=1.4-snapshot` option tells Git to pull down the `1.4-snapshot` branch.
+  The code for this older version of the tutorial is on that branch.
+</div>
+
 Change your current directory to `angular-phonecat`.
 
 ```
@@ -246,15 +267,6 @@ npm run update-webdriver
 
 *(You should only need to do this once.)*
 
-You will need to have Java present on your dev machine to allow the Selenium standalone to be started.
-Check if you already have java installed by opening a terminal/command line window and typing
-'''
-java -version
-'''
-If java is already installed and exists in the PATH then you will be shown the version installed,
-if, however you receive a message that "java is not recognized as an internal command or external
-command" you will need to install [java].
-
 Since Protractor works by interacting with a running application, we need to start our web server:
 
 ```
@@ -289,4 +301,3 @@ Now that you have set up your local machine, let's get started with the tutorial
 [bower]: http://bower.io/
 [http-server]: https://github.com/nodeapps/http-server
 [karma]: https://github.com/karma-runner/karma
-[java]: https://www.java.com/en/download/help/download_options.xml

docs/content/tutorial/step_00.ngdoc

@@ -16,7 +16,7 @@ dependencies, as described in {@link index#get-started Get Started}.
 In the `angular-phonecat` directory, run this command:
 
 ```
-git checkout -f step-0
+git checkout -f 1.4-step-0
 ```
 
 

docs/gulpfile.js

@@ -1,9 +1,5 @@
 "use strict";
 
-var fs = require('fs');
-var _ = require('lodash');
-var stripJsonComments = require('strip-json-comments');
-
 var gulp = require('gulp');
 var log = require('gulp-util').log;
 var concat = require('gulp-concat');
@@ -29,23 +25,6 @@ var ignoredFiles = '!src/angular.bind.js';
 var assets = 'app/assets/**/*';
 
 
-var getJshintConfig = function(filepath) {
-    return JSON.parse(stripJsonComments(fs.readFileSync(filepath, {encoding: 'utf-8'})));
-};
-
-var getMergedJshintConfig = function(filepath) {
-  // "extends" doesn't work in configuration passed by an object, we need to do the extending ourselves.
-  var config = getJshintConfig(filepath);
-  var baseConfig = getJshintConfig('../.jshintrc-base');
-  _.merge(config, baseConfig);
-  delete config.extends;
-
-  // Examples don't run in strict mode; accept that for now.
-  config.strict = false;
-
-  return config;
-};
-
 var copyComponent = function(component, pattern, sourceFolder, packageFile) {
   pattern = pattern || '/**/*';
   sourceFolder = sourceFolder || bowerFolder;
@@ -111,35 +90,17 @@ gulp.task('assets', ['bower'], function() {
 
 gulp.task('doc-gen', ['bower'], function() {
   var dgeni = new Dgeni([require('./config')]);
-  return dgeni.generate().catch(function() {
+  return dgeni.generate().catch(function(error) {
     process.exit(1);
   });
 });
 
 // JSHint the example and protractor test files
 gulp.task('jshint', ['doc-gen'], function() {
-  var examplesConfig = getMergedJshintConfig('../docs/app/test/.jshintrc');
-  // Some tests use `alert` which is not assumed to be available even with `"browser": true`.
-  examplesConfig.globals.alert = false;
-
-  var protractorConfig = getMergedJshintConfig('../docs/app/e2e/.jshintrc');
-
-  return merge(
-    gulp.src([
-      outputFolder + '/examples/**/*.js',
-      '!' + outputFolder + '/examples/**/protractor.js',
-    ])
-      .pipe(jshint(examplesConfig))
-      .pipe(jshint.reporter('jshint-stylish'))
-      .pipe(jshint.reporter('fail')),
-    gulp.src([
-      outputFolder + '/ptore2e/**/*.js',
-      outputFolder + '/examples/**/protractor.js',
-    ])
-      .pipe(jshint(protractorConfig))
-      .pipe(jshint.reporter('jshint-stylish'))
-      .pipe(jshint.reporter('fail'))
-  );
+  gulp.src([outputFolder + '/ptore2e/**/*.js', outputFolder + '/examples/**/*.js'])
+    .pipe(jshint())
+    .pipe(jshint.reporter('jshint-stylish'))
+    .pipe(jshint.reporter('fail'));
 });
 
 

docs/protractor-conf.js

@@ -6,8 +6,6 @@ config.specs = [
   'app/e2e/**/*.scenario.js'
 ];
 
-config.capabilities = {
-  browserName: 'chrome',
-};
+config.capabilities.browserName = 'chrome';
 
 exports.config = config;

i18n/closure/numberSymbolsExt.js

@@ -20,7 +20,7 @@
  * using the --for_closure flag.
  * File generated from CLDR ver. 27.0.1
  *
- * This file covers those locales that are not covered in
+ * This file coveres those locales that are not covered in
  * "numberformatsymbols.js".
  *
  * Before checkin, this file could have been manually edited. This is

i18n/generate.sh

@@ -9,8 +9,4 @@ npm run test-i18n
 
 node src/closureSlurper.js
 
-npm run test-i18n-ucd
-
-echo "Generating ngParseExt"
-node ucd/src/extract.js
 

i18n/spec/closureI18nExtractorSpec.js

@@ -272,7 +272,7 @@ describe("serializeContent", function() {
   it("should not transform arrays into objects", function() {
     var serializedContent = closureI18nExtractor.serializeContent(newTestLocaleInfo().fr_CA);
     var deserializedLocale = eval("(" + serializedContent + ")");
-    expect(deserializedLocale.DATETIME_FORMATS.MONTH.length).not.toBeUndefined();
+    expect(deserializedLocale.DATETIME_FORMATS.MONTH.length).not.toBe(undefined);
   });
 });
 

i18n/src/parser.js

@@ -11,7 +11,7 @@ var PATTERN_SEP = ';',
     DIGIT       = '#';
 
 /**
- * main function for parser
+ * main funciton for parser
  * @param str {string} pattern to be parsed (e.g. #,##0.###).
  */
 function parsePattern(pattern) {

i18n/ucd/spec/extactValuesSpec.js

@@ -1,53 +0,0 @@
-var extractValues = require('../src/extractValues.js').extractValues;
-var stream = require('stream');
-
-function StringStream(str) {
-  return new stream.Readable({
-    read: function(n) {
-      this.push(str);
-      str = null;
-    }
-  });
-}
-
-describe('extractValues', function() {
-  it('should extract the values from the xml', function(done) {
-    var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><char cp="0002" IDS="Y"></char><char cp="0003" IDS="N"></char></repertoire></ucd>';
-    extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
-      expect(values).toEqual({ IDS_Y : [ [ '0001', '0002' ] ] });
-      done();
-    });
-  });
-
-  it('should extract the values from the xml if the last element matches', function(done) {
-    var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><char cp="0002" IDS="Y"></char><char cp="0003" IDS="Y"></char></repertoire></ucd>';
-    extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
-      expect(values).toEqual({ IDS_Y : [ [ '0001', '0003' ] ] });
-      done();
-    });
-  });
-
-  it('should support `reserved`', function(done) {
-    var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><reserved first-cp="0002" last-cp="0005" IDS="N"></reserved><char cp="0006" IDS="Y"></char></repertoire></ucd>';
-    extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
-      expect(values).toEqual({ IDS_Y : [ [ '0001', '0001' ], [ '0006', '0006' ] ] });
-      done();
-    });
-  });
-
-  it('should support `surrogate`', function(done) {
-    var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><surrogate first-cp="0002" last-cp="0005" IDS="N"></surrogate><char cp="0006" IDS="Y"></char></repertoire></ucd>';
-    extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
-      expect(values).toEqual({ IDS_Y : [ [ '0001', '0001' ], [ '0006', '0006' ] ] });
-      done();
-    });
-  });
-
-  it('should support `noncharactere`', function(done) {
-    var str = '<ucd><repertoire><char cp="0000" IDS="N"></char><char cp="0001" IDS="Y"></char><noncharacter first-cp="0002" last-cp="0005" IDS="N"></noncharacter><char cp="0006" IDS="Y"></char></repertoire></ucd>';
-    extractValues(StringStream(str), {'IDS': 'Y'}, function(values) {
-      expect(values).toEqual({ IDS_Y : [ [ '0001', '0001' ], [ '0006', '0006' ] ] });
-      done();
-    });
-  });
-});

i18n/ucd/spec/generateCodeSpec.js

@@ -1,54 +0,0 @@
-
-var generateCodeModule = require('../src/generateCode.js');
-var generateCode = generateCodeModule.generateCode;
-var generateFunction = generateCodeModule.generateFunction;
-
-describe('generateFunction', function() {
-  it('should generate function with ranges', function() {
-    expect(generateFunction([ [ '0001', '0003' ] ], 'IDS_Y')).toEqual('\
-function IDS_Y(cp) {\n\
-  if (0x0001 <= cp && cp <= 0x0003) return true;\n\
-  return false;\n\
-}\n');
-  });
-
-  it('should generate function with multiple ranges', function() {
-    expect(generateFunction([ [ '0001', '0003' ], [ '0005', '0009'] ], 'IDS_Y')).toEqual('\
-function IDS_Y(cp) {\n\
-  if (0x0001 <= cp && cp <= 0x0003) return true;\n\
-  if (0x0005 <= cp && cp <= 0x0009) return true;\n\
-  return false;\n\
-}\n');
-  });
-
-  it('should generate function with unique values', function() {
-    expect(generateFunction([ [ '0001', '0001' ], [ '0005', '0009'] ], 'IDS_Y')).toEqual('\
-function IDS_Y(cp) {\n\
-  if (cp === 0x0001) return true;\n\
-  if (0x0005 <= cp && cp <= 0x0009) return true;\n\
-  return false;\n\
-}\n');
-  });
-});
-
-describe('generateCode', function() {
-  it('should generate the function for all the values', function() {
-    expect(generateCode({ IDS_Y : [ [ '0001', '0001' ], [ '0006', '0006' ] ], IDC_Y : [ [ '0002', '0002' ], [ '0007', '0007' ] ] })).toEqual('\
-/******************************************************\n\
- *         Generated file, do not modify              *\n\
- *                                                    *\n\
- *****************************************************/\n\
-"use strict";\n\
-function IDS_Y(cp) {\n\
-  if (cp === 0x0001) return true;\n\
-  if (cp === 0x0006) return true;\n\
-  return false;\n\
-}\n\
-function IDC_Y(cp) {\n\
-  if (cp === 0x0002) return true;\n\
-  if (cp === 0x0007) return true;\n\
-  return false;\n\
-}\n\
-');
-  });
-});

i18n/ucd/src/extract.js

@@ -1,28 +0,0 @@
-"use strict";
-
-var fs = require('fs');
-var zlib = require('zlib');
-var extractValues = require('./extractValues').extractValues;
-var generateCode = require('./generateCode').generateCode;
-var generateextractValues = require('./extractValues').extractValues;
-// ID_Start and ID_Continue
-var propertiesToExtract = {'IDS': 'Y', 'IDC': 'Y'};
-
-function main() {
-  extractValues(
-    fs.createReadStream('./ucd/src/ucd.all.flat.xml.gz').pipe(zlib.createGunzip()),
-    propertiesToExtract,
-    writeFile);
-
-  function writeFile(validRanges) {
-    var code = generateCode(validRanges);
-    try {
-      var stats = fs.lstatSync('../src/ngParseExt');
-    } catch (e) {
-      fs.mkdirSync('../src/ngParseExt');
-    }
-    fs.writeFile('../src/ngParseExt/ucd.js', code);
-  }
-}
-
-main();

i18n/ucd/src/extractValues.js

@@ -1,58 +0,0 @@
-/**
- * Extract values from a stream.
- */
-
-exports.extractValues = extractValues;
-
-var sax = require('sax/lib/sax');
-var saxStrict = true;
-var saxOptions = {};
-var validXMLTagNames = { char: 'Y', reserved: 'Y', surrogate: 'Y', noncharacter: 'Y'};
-
-function extractValues(stream, propertiesToExtract, callback) {
-  var saxStream = sax.createStream(saxStrict, saxOptions);
-  var firstValid = {};
-  var lastValid = {};
-  var keys = Object.keys(propertiesToExtract);
-  var keyValues = keys.map(function(k) { return propertiesToExtract[k]; });
-  var validRanges = {};
-
-  for (var i in keys) {
-    validRanges[keys[i] + '_' + keyValues[i]] = [];
-  }
-  saxStream.onopentag = onOpenTag;
-  stream
-    .pipe(saxStream)
-    .on('end', doCallback);
-
-  function onOpenTag(node) {
-    var property;
-    if (validXMLTagNames[node.name]) {
-      for (var i in keys) {
-        property = keyValues[i];
-        if (node.attributes[keys[i]] === property) validProperty(keys[i] + '_' + property, node);
-        else invalidProperty(keys[i] + '_' + property);
-      }
-    }
-  }
-
-  function validProperty(property, node) {
-    if (!firstValid[property]) firstValid[property] =
-        node.attributes.cp || node.attributes['first-cp'];
-    lastValid[property] = node.attributes.cp || node.attributes['last-cp'];
-  }
-
-  function invalidProperty(property) {
-    if (!firstValid[property]) return;
-    validRanges[property].push([firstValid[property], lastValid[property]]);
-    firstValid[property] = null;
-  }
-
-  function doCallback() {
-    for (var i in keys) {
-      property = keys[i] + '_' + keyValues[i];
-      invalidProperty(property);
-    }
-    callback(validRanges);
-  }
-}

i18n/ucd/src/generateCode.js

@@ -1,33 +0,0 @@
-
-exports.generateCode = generateCode;
-exports.generateFunction = generateFunction;
-
-function generateCode(validRanges) {
-  var code = '/******************************************************\n' +
-             ' *         Generated file, do not modify              *\n' +
-             ' *                                                    *\n' +
-             ' *****************************************************/\n' +
-             '"use strict";\n';
-  var keys = Object.keys(validRanges);
-  for (var i in keys) {
-    code += generateFunction(validRanges[keys[i]], keys[i]);
-  }
-  return code;
-}
-
-
-function generateFunction(positiveElements, functionName) {
-  var result = [];
-  result.push('function ', functionName, '(cp) {\n');
-  positiveElements.forEach(function(range) {
-    if (range[0] === range[1]) {
-      result.push('  if (cp === 0x', range[0], ')');
-    } else {
-      result.push('  if (0x', range[0], ' <= cp && cp <= 0x', range[1], ')');
-    }
-    result.push(' return true;\n');
-  });
-  result.push('  return false;\n}\n');
-  return result.join('');
-}
-

karma-shared.conf.js

@@ -37,25 +37,19 @@ module.exports = function(config, specificOptions) {
       'SL_Chrome': {
         base: 'SauceLabs',
         browserName: 'chrome',
-        version: '47'
+        version: '43'
       },
       'SL_Firefox': {
         base: 'SauceLabs',
         browserName: 'firefox',
-        version: '43'
+        version: '39'
       },
-      'SL_Safari_8': {
+      'SL_Safari': {
         base: 'SauceLabs',
         browserName: 'safari',
         platform: 'OS X 10.10',
         version: '8'
       },
-      'SL_Safari_9': {
-        base: 'SauceLabs',
-        browserName: 'safari',
-        platform: 'OS X 10.11',
-        version: '9'
-      },
       'SL_IE_9': {
         base: 'SauceLabs',
         browserName: 'internet explorer',

lib/grunt/utils.js

@@ -287,7 +287,7 @@ module.exports = {
   rewrite: function(){
     return function(req, res, next){
       var REWRITE = /\/(guide|api|cookbook|misc|tutorial|error).*$/,
-          IGNORED = /(\.(css|js|png|jpg|gif|svg)$|partials\/.*\.html$)/,
+          IGNORED = /(\.(css|js|png|jpg|gif)$|partials\/.*\.html$)/,
           match;
 
       if (!IGNORED.test(req.url) && (match = req.url.match(REWRITE))) {

lib/htmlparser/htmlparser.js

@@ -0,0 +1,309 @@
+/*
+ * HTML Parser By John Resig (ejohn.org)
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * // Use like so:
+ * htmlParser(htmlString, {
+ *     start: function(tag, attrs, unary) {},
+ *     end: function(tag) {},
+ *     chars: function(text) {},
+ *     comment: function(text) {}
+ * });
+ *
+ * // or to get an XML string:
+ * HTMLtoXML(htmlString);
+ *
+ * // or to get an XML DOM Document
+ * HTMLtoDOM(htmlString);
+ *
+ * // or to inject into an existing document/DOM node
+ * HTMLtoDOM(htmlString, document);
+ * HTMLtoDOM(htmlString, document.body);
+ *
+ */
+
+(function(){
+
+  // Regular Expressions for parsing tags and attributes
+  var startTag = /^<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
+    endTag = /^<\/(\w+)[^>]*>/,
+    attr = /(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
+
+  // Empty Elements - HTML 4.01
+  var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed");
+
+  // Block Elements - HTML 4.01
+  var block = makeMap("address,applet,blockquote,button,center,dd,del,dir,div,dl,dt,fieldset,form,frameset,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,p,pre,script,table,tbody,td,tfoot,th,thead,tr,ul");
+
+  // Inline Elements - HTML 4.01
+  var inline = makeMap("a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
+
+  // Elements that you can, intentionally, leave open
+  // (and which close themselves)
+  var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
+
+  // Attributes that have their values filled in disabled="disabled"
+  var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
+
+  // Special Elements (can contain anything)
+  var special = makeMap("script,style");
+
+  var htmlParser = this.htmlParser = function( html, handler ) {
+    var index, chars, match, stack = [], last = html;
+    stack.last = function(){
+      return this[ this.length - 1 ];
+    };
+
+    while ( html ) {
+      chars = true;
+
+      // Make sure we're not in a script or style element
+      if ( !stack.last() || !special[ stack.last() ] ) {
+
+        // Comment
+        if ( html.indexOf("<!--") == 0 ) {
+          index = html.indexOf("-->");
+
+          if ( index >= 0 ) {
+            if ( handler.comment )
+              handler.comment( html.substring( 4, index ) );
+            html = html.substring( index + 3 );
+            chars = false;
+          }
+
+        // end tag
+        } else if ( html.indexOf("</") == 0 ) {
+          match = html.match( endTag );
+
+          if ( match ) {
+            html = html.substring( match[0].length );
+            match[0].replace( endTag, parseEndTag );
+            chars = false;
+          }
+
+        // start tag
+        } else if ( html.indexOf("<") == 0 ) {
+          match = html.match( startTag );
+
+          if ( match ) {
+            html = html.substring( match[0].length );
+            match[0].replace( startTag, parseStartTag );
+            chars = false;
+          }
+        }
+
+        if ( chars ) {
+          index = html.indexOf("<");
+
+          var text = index < 0 ? html : html.substring( 0, index );
+          html = index < 0 ? "" : html.substring( index );
+
+          if ( handler.chars )
+            handler.chars( text );
+        }
+
+      } else {
+        html = html.replace(new RegExp("(.*)<\/" + stack.last() + "[^>]*>"), function(all, text){
+          text = text.replace(/<!--(.*?)-->/g, "$1")
+            .replace(/<!\[CDATA\[(.*?)]]>/g, "$1");
+
+          if ( handler.chars )
+            handler.chars( text );
+
+          return "";
+        });
+
+        parseEndTag( "", stack.last() );
+      }
+
+      if ( html == last )
+        throw "Parse Error: " + html;
+      last = html;
+    }
+
+    // Clean up any remaining tags
+    parseEndTag();
+
+    function parseStartTag( tag, tagName, rest, unary ) {
+      if ( block[ tagName ] ) {
+        while ( stack.last() && inline[ stack.last() ] ) {
+          parseEndTag( "", stack.last() );
+        }
+      }
+
+      if ( closeSelf[ tagName ] && stack.last() == tagName ) {
+        parseEndTag( "", tagName );
+      }
+
+      unary = empty[ tagName ] || !!unary;
+
+      if ( !unary )
+        stack.push( tagName );
+
+      if ( handler.start ) {
+        var attrs = [];
+
+        rest.replace(attr, function(match, name) {
+          var value = arguments[2] ? arguments[2] :
+            arguments[3] ? arguments[3] :
+            arguments[4] ? arguments[4] :
+            fillAttrs[name] ? name : "";
+
+          attrs.push({
+            name: name,
+            value: value,
+            escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') //"
+          });
+        });
+
+        if ( handler.start )
+          handler.start( tagName, attrs, unary );
+      }
+    }
+
+    function parseEndTag( tag, tagName ) {
+      // If no tag name is provided, clean shop
+      if ( !tagName )
+        var pos = 0;
+
+      // Find the closest opened tag of the same type
+      else
+        for ( var pos = stack.length - 1; pos >= 0; pos-- )
+          if ( stack[ pos ] == tagName )
+            break;
+
+      if ( pos >= 0 ) {
+        // Close all the open elements, up the stack
+        for ( var i = stack.length - 1; i >= pos; i-- )
+          if ( handler.end )
+            handler.end( stack[ i ] );
+
+        // Remove the open elements from the stack
+        stack.length = pos;
+      }
+    }
+  };
+
+  this.HTMLtoXML = function( html ) {
+    var results = "";
+
+    htmlParser(html, {
+      start: function( tag, attrs, unary ) {
+        results += "<" + tag;
+
+        for ( var i = 0; i < attrs.length; i++ )
+          results += " " + attrs[i].name + '="' + attrs[i].escaped + '"';
+
+        results += (unary ? "/" : "") + ">";
+      },
+      end: function( tag ) {
+        results += "</" + tag + ">";
+      },
+      chars: function( text ) {
+        results += text;
+      },
+      comment: function( text ) {
+        results += "<!--" + text + "-->";
+      }
+    });
+
+    return results;
+  };
+
+  this.HTMLtoDOM = function( html, doc ) {
+    // There can be only one of these elements
+    var one = makeMap("html,head,body,title");
+
+    // Enforce a structure for the document
+    var structure = {
+      link: "head",
+      base: "head"
+    };
+
+    if ( !doc ) {
+      if ( typeof DOMDocument != "undefined" )
+        doc = new DOMDocument();
+      else if ( typeof document != "undefined" && document.implementation && document.implementation.createDocument )
+        doc = document.implementation.createDocument("", "", null);
+      else if ( typeof ActiveX != "undefined" )
+        doc = new ActiveXObject("Msxml.DOMDocument");
+
+    } else
+      doc = doc.ownerDocument ||
+        doc.getOwnerDocument && doc.getOwnerDocument() ||
+        doc;
+
+    var elems = [],
+      documentElement = doc.documentElement ||
+        doc.getDocumentElement && doc.getDocumentElement();
+
+    // If we're dealing with an empty document then we
+    // need to pre-populate it with the HTML document structure
+    if ( !documentElement && doc.createElement ) (function(){
+      var html = doc.createElement("html");
+      var head = doc.createElement("head");
+      head.appendChild( doc.createElement("title") );
+      html.appendChild( head );
+      html.appendChild( doc.createElement("body") );
+      doc.appendChild( html );
+    })();
+
+    // Find all the unique elements
+    if ( doc.getElementsByTagName )
+      for ( var i in one )
+        one[ i ] = doc.getElementsByTagName( i )[0];
+
+    // If we're working with a document, inject contents into
+    // the body element
+    var curParentNode = one.body;
+
+    htmlParser( html, {
+      start: function( tagName, attrs, unary ) {
+        // If it's a pre-built element, then we can ignore
+        // its construction
+        if ( one[ tagName ] ) {
+          curParentNode = one[ tagName ];
+          return;
+        }
+
+        var elem = doc.createElement( tagName );
+
+        for ( var attr in attrs )
+          elem.setAttribute( attrs[ attr ].name, attrs[ attr ].value );
+
+        if ( structure[ tagName ] && typeof one[ structure[ tagName ] ] != "boolean" )
+          one[ structure[ tagName ] ].appendChild( elem );
+
+        else if ( curParentNode && curParentNode.appendChild )
+          curParentNode.appendChild( elem );
+
+        if ( !unary ) {
+          elems.push( elem );
+          curParentNode = elem;
+        }
+      },
+      end: function( tag ) {
+        elems.length -= 1;
+
+        // Init the new parentNode
+        curParentNode = elems[ elems.length - 1 ];
+      },
+      chars: function( text ) {
+        curParentNode.appendChild( doc.createTextNode( text ) );
+      },
+      comment: function( text ) {
+        // create comment node
+      }
+    });
+
+    return doc;
+  };
+
+  function makeMap(str){
+    var obj = {}, items = str.split(",");
+    for ( var i = 0; i < items.length; i++ )
+      obj[ items[i] ] = true;
+    return obj;
+  }
+})();

lib/saucelabs/start_tunnel.sh

@@ -11,7 +11,8 @@ set -e
 # Curl and run this script as part of your .travis.yml before_script section:
 # before_script:
 #   - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
-CONNECT_URL="https://saucelabs.com/downloads/sc-4.3.13-linux.tar.gz"
+
+CONNECT_URL="https://saucelabs.com/downloads/sc-4.3.7-linux.tar.gz"
 CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
 CONNECT_DOWNLOAD="sc-4.3.7-linux.tar.gz"
 

lib/versions/version-info.js

@@ -178,7 +178,7 @@ var getSnapshotVersion = function() {
     // last release was a non beta release. Increment the patch level to
     // indicate the next release that we will be doing.
     // E.g. last release was 1.3.0, then the snapshot will be
-    // 1.3.1-build.1, which is lesser than 1.3.1 according to the semver!
+    // 1.3.1-build.1, which is lesser than 1.3.1 accorind the semver!
 
     // If the last release was a beta release we don't update the
     // beta number by purpose, as otherwise the semver comparison

package.json

@@ -1,15 +1,15 @@
 {
   "name": "angularjs",
   "license": "MIT",
-  "branchVersion": "1.5.x",
-  "branchPattern": "1.5.*",
-  "distTag": "latest",
+  "branchVersion": "1.4.x",
+  "branchPattern": "1.4.*",
+  "distTag": "previous_1_4",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular.js.git"
   },
   "engines": {
-    "node": "<5",
+    "node": "~0.10",
     "npm": "~2.5"
   },
   "engineStrict": true,
@@ -17,8 +17,7 @@
     "preinstall": "node scripts/npm/check-node-modules.js --purge",
     "postinstall": "node scripts/npm/copy-npm-shrinkwrap.js",
     "commit": "git-cz",
-    "test-i18n": "jasmine-node i18n/spec",
-    "test-i18n-ucd": "jasmine-node i18n/ucd/spec"
+    "test-i18n": "jasmine-node i18n/spec"
   },
   "devDependencies": {
     "angular-benchpress": "0.x.x",
@@ -28,9 +27,9 @@
     "canonical-path": "0.0.2",
     "cheerio": "^0.17.0",
     "commitizen": "^2.3.0",
-    "cz-conventional-changelog": "1.1.4",
+    "cz-conventional-changelog": "^1.1.4",
     "dgeni": "^0.4.0",
-    "dgeni-packages": "^0.12.0",
+    "dgeni-packages": "^0.11.0",
     "event-stream": "~3.1.0",
     "glob": "^6.0.1",
     "grunt": "~0.4.2",
@@ -39,30 +38,28 @@
     "grunt-contrib-compress": "~0.12.0",
     "grunt-contrib-connect": "~0.8.0",
     "grunt-contrib-copy": "~0.6.0",
-    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-jshint": "~0.10.0",
     "grunt-ddescribe-iit": "~0.0.1",
     "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
-    "grunt-jscs": "^2.1.0",
+    "grunt-jscs": "~1.2.0",
     "grunt-merge-conflict": "~0.0.1",
     "grunt-shell": "~1.1.1",
     "gulp": "~3.8.0",
     "gulp-concat": "^2.4.1",
     "gulp-foreach": "0.0.1",
-    "gulp-jshint": "^2.0.0",
+    "gulp-jshint": "~1.4.2",
     "gulp-rename": "^1.2.0",
     "gulp-sourcemaps": "^1.2.2",
     "gulp-uglify": "^1.0.1",
     "gulp-util": "^3.0.1",
-    "jasmine-core": "^2.4.0",
     "jasmine-node": "^2.0.0",
-    "jasmine-reporters": "~1.0.1",
-    "jshint": "^2.9.1",
-    "jshint-stylish": "^2.1.0",
+    "jasmine-reporters": "^2.2.0",
+    "jshint-stylish": "~1.0.0",
     "karma": "^0.13.19",
     "karma-browserstack-launcher": "^0.1.8",
     "karma-chrome-launcher": "^0.2.2",
     "karma-firefox-launcher": "^0.1.7",
-    "karma-jasmine": "^0.3.7",
+    "karma-jasmine": "^0.1.6",
     "karma-junit-reporter": "^0.3.8",
     "karma-ng-scenario": "^0.1.0",
     "karma-sauce-launcher": "^0.3.0",
@@ -72,17 +69,15 @@
     "marked": "~0.3.0",
     "node-html-encoder": "0.0.2",
     "promises-aplus-tests": "~2.1.0",
-    "protractor": "^2.1.0",
+    "protractor": "^4.0.11",
     "q": "~1.0.0",
     "q-io": "^1.10.9",
     "qq": "^0.3.5",
     "rewire": "~2.1.0",
-    "sax": "^1.1.1",
     "semver": "~4.0.3",
     "shelljs": "~0.3.0",
     "sorted-object": "^1.0.0",
-    "stringmap": "^0.2.2",
-    "strip-json-comments": "^2.0.1"
+    "stringmap": "^0.2.2"
   },
   "licenses": [
     {

protractor-conf.js

@@ -8,8 +8,6 @@ config.specs = [
   'docs/app/e2e/**/*.scenario.js'
 ];
 
-config.capabilities = {
-  browserName: 'chrome'
-};
+config.capabilities.browserName = 'chrome';
 
 exports.config = config;

protractor-jenkins-conf.js

@@ -15,7 +15,7 @@ exports.config = {
 
   baseUrl: 'http://localhost:8000/',
 
-  framework: 'jasmine',
+  framework: 'jasmine2',
 
   onPrepare: function() {
     /* global angular: false, browser: false, jasmine: false */
@@ -29,9 +29,10 @@ exports.config = {
 
     browser.addMockModule('disableNgAnimate', disableNgAnimate);
 
-    require('jasmine-reporters');
-    jasmine.getEnv().addReporter(
-      new jasmine.JUnitXmlReporter('test_out/docs-e2e-' + exports.config.capabilities.browserName + '-', true, true));
+    var reporters = require('jasmine-reporters');
+    jasmine.getEnv().addReporter(new reporters.JUnitXmlReporter({
+      savePath: 'test_out/docs-e2e-' + exports.config.capabilities.browserName + '-'
+    }));
   },
 
   jasmineNodeOpts: {

protractor-shared-conf.js

@@ -5,7 +5,12 @@ exports.config = {
 
   baseUrl: 'http://localhost:8000/',
 
-  framework: 'jasmine',
+  framework: 'jasmine2',
+
+  capabilities: {
+    // Fix element scrolling behavior in Firefox for fixed header elements (like angularjs.org has)
+    'elementScrollBehavior': 1
+  },
 
   onPrepare: function() {
     /* global angular: false, browser: false, jasmine: false */

protractor-travis-conf.js

@@ -13,7 +13,7 @@ if (process.env.BROWSER_PROVIDER === 'browserstack') {
     }),
     capabilitiesForBrowserStack({
       browserName: 'firefox',
-      version: '28'
+      version: '47'
     }),
     capabilitiesForBrowserStack({
       browserName: 'safari',
@@ -33,7 +33,7 @@ if (process.env.BROWSER_PROVIDER === 'browserstack') {
     }),
     capabilitiesForSauceLabs({
       browserName: 'firefox',
-      version: '28'
+      version: '47'
     }),
     capabilitiesForSauceLabs({
       browserName: 'safari',
@@ -54,7 +54,7 @@ function capabilitiesForBrowserStack(capabilities) {
   return {
     'browserstack.user': process.env.BROWSER_STACK_USERNAME,
     'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY,
-    'browserstack.local' : 'true',
+    'browserstack.local': 'true',
     'browserstack.debug': 'true',
     'browserstack.tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER,
     'tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER,
@@ -64,7 +64,8 @@ function capabilitiesForBrowserStack(capabilities) {
 
     'browserName': capabilities.browserName,
     'platform': capabilities.platform,
-    'version': capabilities.version
+    'version': capabilities.version,
+    'elementScrollBehavior': 1
   };
 }
 
@@ -77,6 +78,7 @@ function capabilitiesForSauceLabs(capabilities) {
 
     'browserName': capabilities.browserName,
     'platform': capabilities.platform,
-    'version': capabilities.version
+    'version': capabilities.version,
+    'elementScrollBehavior': 1
   };
 }

scripts/bower/repos.inc

@@ -11,7 +11,6 @@ REPOS=(
   angular-message-format
   angular-messages
   angular-mocks
-  angular-parse-ext
   angular-resource
   angular-route
   angular-sanitize

scripts/travis/build.sh

@@ -11,7 +11,7 @@ elif [ $JOB = "unit" ]; then
   if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
     BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_iOS"
   else
-    BROWSERS="SL_Chrome,SL_Firefox,SL_Safari_8,SL_Safari_9,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS"
+    BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS"
   fi
 
   grunt test:promises-aplus

src/.jshintrc

@@ -1,8 +1,7 @@
 {
   "extends": "../.jshintrc-base",
+  "browser": true,
   "globals": {
-    "window": false,
-
     /* auto/injector.js */
     "createInjector": false,
 
@@ -95,6 +94,8 @@
     "VALIDITY_STATE_PROPERTY": false,
     "reloadWithDebugInfo": false,
 
+    "skipDestroyOnNextJQueryCleanData": true,
+
     "NODE_TYPE_ELEMENT": false,
     "NODE_TYPE_ATTRIBUTE": false,
     "NODE_TYPE_TEXT": false,

src/Angular.js

@@ -102,7 +102,6 @@
  * @ngdoc module
  * @name ng
  * @module ng
- * @installation
  * @description
  *
  * # ng (core module)
@@ -120,9 +119,29 @@ var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/;
 // This is used so that it's possible for internal tests to create mock ValidityStates.
 var VALIDITY_STATE_PROPERTY = 'validity';
 
+/**
+ * @ngdoc function
+ * @name angular.lowercase
+ * @module ng
+ * @kind function
+ *
+ * @description Converts the specified string to lowercase.
+ * @param {string} string String to be converted to lowercase.
+ * @returns {string} Lowercased string.
+ */
+var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
-var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
+/**
+ * @ngdoc function
+ * @name angular.uppercase
+ * @module ng
+ * @kind function
+ *
+ * @description Converts the specified string to uppercase.
+ * @param {string} string String to be converted to uppercase.
+ * @returns {string} Uppercased string.
+ */
 var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
 
 
@@ -142,7 +161,7 @@ var manualUppercase = function(s) {
 
 // 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
+// with correct but slower alternatives.
 if ('i' !== 'I'.toLowerCase()) {
   lowercase = manualLowercase;
   uppercase = manualUppercase;
@@ -169,7 +188,7 @@ var
  * documentMode is an IE-only property
  * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx
  */
-msie = window.document.documentMode;
+msie = document.documentMode;
 
 
 /**
@@ -185,7 +204,7 @@ function isArrayLike(obj) {
 
   // arrays, strings and jQuery/jqLite objects are array like
   // * jqLite is either the jQuery or jqLite constructor function
-  // * we have to check the existence of jqLite first as this method is called
+  // * we have to check the existance of jqLite first as this method is called
   //   via the forEach method when constructing the jqLite object in the first place
   if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true;
 
@@ -447,18 +466,28 @@ noop.$inject = [];
  * functional style.
  *
    ```js
-     function transformer(transformationFn, value) {
-       return (transformationFn || angular.identity)(value);
-     };
+   function transformer(transformationFn, value) {
+     return (transformationFn || angular.identity)(value);
+   };
+
+   // E.g.
+   function getResult(fn, input) {
+     return (fn || angular.identity)(input);
+   };
+
+   getResult(function(n) { return n * 2; }, 21);   // returns 42
+   getResult(null, 21);                            // returns 21
+   getResult(undefined, 21);                       // returns 21
    ```
-  * @param {*} value to be returned.
-  * @returns {*} the value passed in.
+ *
+ * @param {*} value to be returned.
+ * @returns {*} the value passed in.
  */
 function identity($) {return $;}
 identity.$inject = [];
 
 
-function valueFn(value) {return function valueRef() {return value;};}
+function valueFn(value) {return function() {return value;};}
 
 function hasCustomToString(obj) {
   return isFunction(obj.toString) && obj.toString !== toString;
@@ -665,10 +694,6 @@ function isTypedArray(value) {
   return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value));
 }
 
-function isArrayBuffer(obj) {
-  return toString.call(obj) === '[object ArrayBuffer]';
-}
-
 
 var trim = function(value) {
   return isString(value) ? value.trim() : value;
@@ -793,7 +818,7 @@ function copy(source, destination) {
   var stackDest = [];
 
   if (destination) {
-    if (isTypedArray(destination) || isArrayBuffer(destination)) {
+    if (isTypedArray(destination)) {
       throw ngMinErr('cpta', "Can't copy! TypedArray destination cannot be mutated.");
     }
     if (source === destination) {
@@ -820,7 +845,7 @@ function copy(source, destination) {
 
   function copyRecurse(source, destination) {
     var h = destination.$$hashKey;
-    var key;
+    var result, key;
     if (isArray(source)) {
       for (var i = 0, ii = source.length; i < ii; i++) {
         destination.push(copyElement(source[i]));
@@ -867,10 +892,24 @@ function copy(source, destination) {
     }
 
     var needsRecurse = false;
-    var destination = copyType(source);
+    var destination;
 
-    if (destination === undefined) {
-      destination = isArray(source) ? [] : Object.create(getPrototypeOf(source));
+    if (isArray(source)) {
+      destination = [];
+      needsRecurse = true;
+    } else if (isTypedArray(source)) {
+      destination = new source.constructor(source);
+    } else if (isDate(source)) {
+      destination = new Date(source.getTime());
+    } else if (isRegExp(source)) {
+      destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
+      destination.lastIndex = source.lastIndex;
+    } else if (isBlob(source)) {
+      destination = new source.constructor([source], {type: source.type});
+    } else if (isFunction(source.cloneNode)) {
+        destination = source.cloneNode(true);
+    } else {
+      destination = Object.create(getPrototypeOf(source));
       needsRecurse = true;
     }
 
@@ -881,48 +920,6 @@ function copy(source, destination) {
       ? copyRecurse(source, destination)
       : destination;
   }
-
-  function copyType(source) {
-    switch (toString.call(source)) {
-      case '[object Int8Array]':
-      case '[object Int16Array]':
-      case '[object Int32Array]':
-      case '[object Float32Array]':
-      case '[object Float64Array]':
-      case '[object Uint8Array]':
-      case '[object Uint8ClampedArray]':
-      case '[object Uint16Array]':
-      case '[object Uint32Array]':
-        return new source.constructor(copyElement(source.buffer));
-
-      case '[object ArrayBuffer]':
-        //Support: IE10
-        if (!source.slice) {
-          var copied = new ArrayBuffer(source.byteLength);
-          new Uint8Array(copied).set(new Uint8Array(source));
-          return copied;
-        }
-        return source.slice(0);
-
-      case '[object Boolean]':
-      case '[object Number]':
-      case '[object String]':
-      case '[object Date]':
-        return new source.constructor(source.valueOf());
-
-      case '[object RegExp]':
-        var re = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
-        re.lastIndex = source.lastIndex;
-        return re;
-
-      case '[object Blob]':
-        return new source.constructor([source], {type: source.type});
-    }
-
-    if (isFunction(source.cloneNode)) {
-      return source.cloneNode(true);
-    }
-  }
 }
 
 /**
@@ -979,78 +976,44 @@ function shallowCopy(src, dst) {
  * @param {*} o1 Object or value to compare.
  * @param {*} o2 Object or value to compare.
  * @returns {boolean} True if arguments are equal.
- *
- * @example
-   <example module="equalsExample" name="equalsExample">
-     <file name="index.html">
-      <div ng-controller="ExampleController">
-        <form novalidate>
-          <h3>User 1</h3>
-          Name: <input type="text" ng-model="user1.name">
-          Age: <input type="number" ng-model="user1.age">
-
-          <h3>User 2</h3>
-          Name: <input type="text" ng-model="user2.name">
-          Age: <input type="number" ng-model="user2.age">
-
-          <div>
-            <br/>
-            <input type="button" value="Compare" ng-click="compare()">
-          </div>
-          User 1: <pre>{{user1 | json}}</pre>
-          User 2: <pre>{{user2 | json}}</pre>
-          Equal: <pre>{{result}}</pre>
-        </form>
-      </div>
-    </file>
-    <file name="script.js">
-        angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) {
-          $scope.user1 = {};
-          $scope.user2 = {};
-          $scope.result;
-          $scope.compare = function() {
-            $scope.result = angular.equals($scope.user1, $scope.user2);
-          };
-        }]);
-    </file>
-  </example>
  */
 function equals(o1, o2) {
   if (o1 === o2) return true;
   if (o1 === null || o2 === null) return false;
   if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
   var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
-  if (t1 == t2 && t1 == 'object') {
-    if (isArray(o1)) {
-      if (!isArray(o2)) return false;
-      if ((length = o1.length) == o2.length) {
-        for (key = 0; key < length; key++) {
+  if (t1 == t2) {
+    if (t1 == 'object') {
+      if (isArray(o1)) {
+        if (!isArray(o2)) return false;
+        if ((length = o1.length) == o2.length) {
+          for (key = 0; key < length; key++) {
+            if (!equals(o1[key], o2[key])) return false;
+          }
+          return true;
+        }
+      } else if (isDate(o1)) {
+        if (!isDate(o2)) return false;
+        return equals(o1.getTime(), o2.getTime());
+      } else if (isRegExp(o1)) {
+        return isRegExp(o2) ? o1.toString() == o2.toString() : false;
+      } else {
+        if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
+          isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
+        keySet = createMap();
+        for (key in o1) {
+          if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
           if (!equals(o1[key], o2[key])) return false;
+          keySet[key] = true;
+        }
+        for (key in o2) {
+          if (!(key in keySet) &&
+              key.charAt(0) !== '$' &&
+              isDefined(o2[key]) &&
+              !isFunction(o2[key])) return false;
         }
         return true;
       }
-    } else if (isDate(o1)) {
-      if (!isDate(o2)) return false;
-      return equals(o1.getTime(), o2.getTime());
-    } else if (isRegExp(o1)) {
-      if (!isRegExp(o2)) return false;
-      return o1.toString() == o2.toString();
-    } else {
-      if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
-        isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
-      keySet = createMap();
-      for (key in o1) {
-        if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
-        if (!equals(o1[key], o2[key])) return false;
-        keySet[key] = true;
-      }
-      for (key in o2) {
-        if (!(key in keySet) &&
-            key.charAt(0) !== '$' &&
-            isDefined(o2[key]) &&
-            !isFunction(o2[key])) return false;
-      }
-      return true;
     }
   }
   return false;
@@ -1060,8 +1023,8 @@ var csp = function() {
   if (!isDefined(csp.rules)) {
 
 
-    var ngCspElement = (window.document.querySelector('[ng-csp]') ||
-                    window.document.querySelector('[data-ng-csp]'));
+    var ngCspElement = (document.querySelector('[ng-csp]') ||
+                    document.querySelector('[data-ng-csp]'));
 
     if (ngCspElement) {
       var ngCspAttribute = ngCspElement.getAttribute('ng-csp') ||
@@ -1136,7 +1099,7 @@ var jq = function() {
   var i, ii = ngAttrPrefixes.length, prefix, name;
   for (i = 0; i < ii; ++i) {
     prefix = ngAttrPrefixes[i];
-    if (el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) {
+    if (el = document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) {
       name = el.getAttribute(prefix + 'jq');
       break;
     }
@@ -1201,7 +1164,7 @@ function toJsonReplacer(key, value) {
     val = undefined;
   } else if (isWindow(value)) {
     val = '$WINDOW';
-  } else if (value &&  window.document === value) {
+  } else if (value &&  document === value) {
     val = '$DOCUMENT';
   } else if (isScope(value)) {
     val = '$SCOPE';
@@ -1441,17 +1404,10 @@ function getNgAttribute(element, ngAttr) {
  * designates the **root element** of the application and is typically placed near the root element
  * of the page - e.g. on the `<body>` or `<html>` tags.
  *
- * There are a few things to keep in mind when using `ngApp`:
- * - only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
- *   found in the document will be used to define the root element to auto-bootstrap as an
- *   application. To run multiple applications in an HTML document you must manually bootstrap them using
- *   {@link angular.bootstrap} instead.
- * - AngularJS applications cannot be nested within each other.
- * - Do not use a directive that uses {@link ng.$compile#transclusion transclusion} on the same element as `ngApp`.
- *   This includes directives such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and
- *   {@link ngRoute.ngView `ngView`}.
- *   Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
- *   causing animations to stop working and making the injector inaccessible from outside the app.
+ * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
+ * found in the document will be used to define the root element to auto-bootstrap as an
+ * application. To run multiple applications in an HTML document you must manually bootstrap them using
+ * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other.
  *
  * You can specify an **AngularJS module** to be used as the root module for the application.  This
  * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It
@@ -1591,25 +1547,16 @@ function angularInit(element, bootstrap) {
  * @description
  * Use this function to manually start up angular application.
  *
- * For more information, see the {@link guide/bootstrap Bootstrap guide}.
+ * See: {@link guide/bootstrap Bootstrap}
+ *
+ * Note that Protractor based end-to-end tests cannot use this function to bootstrap manually.
+ * They must use {@link ng.directive:ngApp ngApp}.
  *
  * Angular will detect if it has been loaded into the browser more than once and only allow the
  * first loaded script to be bootstrapped and will report a warning to the browser console for
  * each of the subsequent scripts. This prevents strange results in applications, where otherwise
  * multiple instances of Angular try to work on the DOM.
  *
- * <div class="alert alert-warning">
- * **Note:** Protractor based end-to-end tests cannot use this function to bootstrap manually.
- * They must use {@link ng.directive:ngApp ngApp}.
- * </div>
- *
- * <div class="alert alert-warning">
- * **Note:** Do not bootstrap the app on an element with a directive that uses {@link ng.$compile#transclusion transclusion},
- * such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and {@link ngRoute.ngView `ngView`}.
- * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
- * causing animations to stop working and making the injector inaccessible from outside the app.
- * </div>
- *
  * ```html
  * <!doctype html>
  * <html>
@@ -1653,7 +1600,7 @@ function bootstrap(element, modules, config) {
     element = jqLite(element);
 
     if (element.injector()) {
-      var tag = (element[0] === window.document) ? 'document' : startingTag(element);
+      var tag = (element[0] === document) ? 'document' : startingTag(element);
       //Encode angle brackets to prevent input from being sanitized to empty string #8683
       throw ngMinErr(
           'btstrpd',
@@ -1752,6 +1699,7 @@ function snake_case(name, separator) {
 }
 
 var bindJQueryFired = false;
+var skipDestroyOnNextJQueryCleanData;
 function bindJQuery() {
   var originalCleanData;
 
@@ -1785,11 +1733,15 @@ function bindJQuery() {
     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');
+      if (!skipDestroyOnNextJQueryCleanData) {
+        for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+          events = jQuery._data(elem, "events");
+          if (events && events.$destroy) {
+            jQuery(elem).triggerHandler('$destroy');
+          }
         }
+      } else {
+        skipDestroyOnNextJQueryCleanData = false;
       }
       originalCleanData(elems);
     };

src/AngularPublic.js

@@ -63,7 +63,6 @@
   $BrowserProvider,
   $CacheFactoryProvider,
   $ControllerProvider,
-  $DateProvider,
   $DocumentProvider,
   $ExceptionHandlerProvider,
   $FilterProvider,

src/angular.prefix

@@ -1,6 +1,6 @@
 /**
  * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2016 Google, Inc. http://angularjs.org
+ * (c) 2010-2015 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window) {
+(function(window, document, undefined) {

src/angular.suffix

@@ -1,5 +1,5 @@
-  jqLite(window.document).ready(function() {
-    angularInit(window.document, bootstrap);
+  jqLite(document).ready(function() {
+    angularInit(document, bootstrap);
   });
 
-})(window);
+})(window, document);

src/auto/injector.js

@@ -57,29 +57,22 @@
 /**
  * @ngdoc module
  * @name auto
- * @installation
  * @description
  *
  * Implicit module which gets automatically added to each {@link auto.$injector $injector}.
  */
 
-var ARROW_ARG = /^([^\(]+?)=>/;
 var FN_ARGS = /^[^\(]*\(\s*([^\)]*)\)/m;
 var FN_ARG_SPLIT = /,/;
 var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
 var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 var $injectorMinErr = minErr('$injector');
 
-function extractArgs(fn) {
-  var fnText = Function.prototype.toString.call(fn).replace(STRIP_COMMENTS, ''),
-      args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS);
-  return args;
-}
-
 function anonFn(fn) {
   // For anonymous functions, showing at the very least the function signature can help in
   // debugging.
-  var args = extractArgs(fn);
+  var fnText = fn.toString().replace(STRIP_COMMENTS, ''),
+      args = fnText.match(FN_ARGS);
   if (args) {
     return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')';
   }
@@ -88,6 +81,7 @@ function anonFn(fn) {
 
 function annotate(fn, strictDi, name) {
   var $inject,
+      fnText,
       argDecl,
       last;
 
@@ -102,7 +96,8 @@ function annotate(fn, strictDi, name) {
           throw $injectorMinErr('strictdi',
             '{0} is not using explicit annotation and cannot be invoked in strict mode', name);
         }
-        argDecl = extractArgs(fn);
+        fnText = fn.toString().replace(STRIP_COMMENTS, '');
+        argDecl = fnText.match(FN_ARGS);
         forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) {
           arg.replace(FN_ARG, function(all, underscore, name) {
             $inject.push(name);
@@ -657,19 +652,14 @@ function createInjector(modulesToLoad, strictDi) {
             throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
           })),
       instanceCache = {},
-      protoInstanceInjector =
+      instanceInjector = (instanceCache.$injector =
           createInternalInjector(instanceCache, function(serviceName, caller) {
             var provider = providerInjector.get(serviceName + providerSuffix, caller);
-            return instanceInjector.invoke(
-                provider.$get, provider, undefined, serviceName);
-          }),
-      instanceInjector = protoInstanceInjector;
+            return instanceInjector.invoke(provider.$get, provider, undefined, serviceName);
+          }));
 
-  providerCache['$injector' + providerSuffix] = { $get: valueFn(protoInstanceInjector) };
-  var runBlocks = loadModules(modulesToLoad);
-  instanceInjector = protoInstanceInjector.get('$injector');
-  instanceInjector.strictDi = strictDi;
-  forEach(runBlocks, function(fn) { if (fn) instanceInjector.invoke(fn); });
+
+  forEach(loadModules(modulesToLoad), function(fn) { if (fn) instanceInjector.invoke(fn); });
 
   return instanceInjector;
 
@@ -819,66 +809,47 @@ function createInjector(modulesToLoad, strictDi) {
       }
     }
 
-
-    function injectionArgs(fn, locals, serviceName) {
-      var args = [],
-          $inject = createInjector.$$annotate(fn, strictDi, serviceName);
-
-      for (var i = 0, length = $inject.length; i < length; i++) {
-        var key = $inject[i];
-        if (typeof key !== 'string') {
-          throw $injectorMinErr('itkn',
-                  'Incorrect injection token! Expected service name as string, got {0}', key);
-        }
-        args.push(locals && locals.hasOwnProperty(key) ? locals[key] :
-                                                         getService(key, serviceName));
-      }
-      return args;
-    }
-
-    function isClass(func) {
-      // IE 9-11 do not support classes and IE9 leaks with the code below.
-      if (msie <= 11) {
-        return false;
-      }
-      // Workaround for MS Edge.
-      // Check https://connect.microsoft.com/IE/Feedback/Details/2211653
-      return typeof func === 'function'
-        && /^(?:class\s|constructor\()/.test(Function.prototype.toString.call(func));
-    }
-
     function invoke(fn, self, locals, serviceName) {
       if (typeof locals === 'string') {
         serviceName = locals;
         locals = null;
       }
 
-      var args = injectionArgs(fn, locals, serviceName);
+      var args = [],
+          $inject = createInjector.$$annotate(fn, strictDi, serviceName),
+          length, i,
+          key;
+
+      for (i = 0, length = $inject.length; i < length; i++) {
+        key = $inject[i];
+        if (typeof key !== 'string') {
+          throw $injectorMinErr('itkn',
+                  'Incorrect injection token! Expected service name as string, got {0}', key);
+        }
+        args.push(
+          locals && locals.hasOwnProperty(key)
+          ? locals[key]
+          : getService(key, serviceName)
+        );
+      }
       if (isArray(fn)) {
-        fn = fn[fn.length - 1];
+        fn = fn[length];
       }
 
-      if (!isClass(fn)) {
-        // http://jsperf.com/angularjs-invoke-apply-vs-switch
-        // #5388
-        return fn.apply(self, args);
-      } else {
-        args.unshift(null);
-        return new (Function.prototype.bind.apply(fn, args))();
-      }
+      // http://jsperf.com/angularjs-invoke-apply-vs-switch
+      // #5388
+      return fn.apply(self, args);
     }
 
-
     function instantiate(Type, locals, serviceName) {
       // Check if Type is annotated and use just the given function at n-1 as parameter
       // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]);
-      var ctor = (isArray(Type) ? Type[Type.length - 1] : Type);
-      var args = injectionArgs(Type, locals, serviceName);
-      // Empty object at position 0 is ignored for invocation with `new`, but required.
-      args.unshift(null);
-      return new (Function.prototype.bind.apply(ctor, args))();
-    }
+      // Object creation: http://jsperf.com/create-constructor/2
+      var instance = Object.create((isArray(Type) ? Type[Type.length - 1] : Type).prototype || null);
+      var returnedValue = invoke(Type, instance, locals, serviceName);
 
+      return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance;
+    }
 
     return {
       invoke: invoke,

src/jqLite.js

@@ -114,9 +114,6 @@
  * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top
  *   parent element is reached.
  *
- * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See
- * https://github.com/angular/angular.js/issues/14251 for more information.
- *
  * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery.
  * @returns {Object} jQuery object.
  */
@@ -199,12 +196,6 @@ function jqLiteHasData(node) {
   return false;
 }
 
-function jqLiteCleanData(nodes) {
-  for (var i = 0, ii = nodes.length; i < ii; i++) {
-    jqLiteRemoveData(nodes[i]);
-  }
-}
-
 function jqLiteBuildFragment(html, context) {
   var tmp, tag, wrap,
       fragment = context.createDocumentFragment(),
@@ -243,7 +234,7 @@ function jqLiteBuildFragment(html, context) {
 }
 
 function jqLiteParseHTML(html, context) {
-  context = context || window.document;
+  context = context || document;
   var parsed;
 
   if ((parsed = SINGLE_TAG_REGEXP.exec(html))) {
@@ -269,7 +260,7 @@ function jqLiteWrapNode(node, wrapper) {
 
 
 // IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
-var jqLiteContains = window.Node.prototype.contains || function(arg) {
+var jqLiteContains = Node.prototype.contains || function(arg) {
   // jshint bitwise: false
   return !!(this.compareDocumentPosition(arg) & 16);
   // jshint bitwise: true
@@ -517,7 +508,7 @@ function jqLiteRemove(element, keepData) {
 function jqLiteDocumentLoaded(action, win) {
   win = win || window;
   if (win.document.readyState === 'complete') {
-    // Force the action to be run async for consistent behavior
+    // Force the action to be run async for consistent behaviour
     // from the action's point of view
     // i.e. it will definitely not be in a $apply
     win.setTimeout(action);
@@ -541,8 +532,8 @@ var JQLitePrototype = JQLite.prototype = {
     }
 
     // check if document is already loaded
-    if (window.document.readyState === 'complete') {
-      window.setTimeout(trigger);
+    if (document.readyState === 'complete') {
+      setTimeout(trigger);
     } else {
       this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
       // we can not use jqLite since we are not done loading and jQuery could be loaded later.
@@ -603,8 +594,7 @@ function getAliasedAttrName(name) {
 forEach({
   data: jqLiteData,
   removeData: jqLiteRemoveData,
-  hasData: jqLiteHasData,
-  cleanData: jqLiteCleanData
+  hasData: jqLiteHasData
 }, function(fn, name) {
   JQLite[name] = fn;
 });

src/loader.js

@@ -282,19 +282,6 @@ function setupModuleLoader(window) {
            */
           directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
 
-          /**
-           * @ngdoc method
-           * @name angular.Module#component
-           * @module ng
-           * @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})
-           *
-           * @description
-           * See {@link ng.$compileProvider#component $compileProvider.component()}.
-           */
-          component: invokeLaterAndSetModuleName('$compileProvider', 'component'),
-
           /**
            * @ngdoc method
            * @name angular.Module#config

src/loader.prefix

@@ -1,8 +1,8 @@
 /**
  * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2016 Google, Inc. http://angularjs.org
+ * (c) 2010-2015 Google, Inc. http://angularjs.org
  * License: MIT
  */
 'use strict';
 (function() {
-    function isFunction(value) {return typeof value === 'function';};
+    function isFunction(value) {return typeof value === 'function';};

src/module.prefix

@@ -1,6 +1,6 @@
 /**
  * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2016 Google, Inc. http://angularjs.org
+ * (c) 2010-2015 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, angular) {
+(function(window, angular, undefined) {

src/ng/anchorScroll.js

@@ -41,7 +41,7 @@ function $AnchorScrollProvider() {
    * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
    * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
    * in the
-   * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#the-indicated-part-of-the-document).
+   * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#an-indicated-part-of-the-document).
    *
    * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
    * match any anchor whenever it changes. This can be disabled by calling