chore(package.json): update to latest dgeni-packages

This fixes problems with testing against Chrome 54.

.eslintignore

@@ -0,0 +1,11 @@
+bower_components/**
+build/**
+docs/bower_components/**
+docs/app/assets/js/angular-bootstrap/**
+docs/config/templates/**
+node_modules/**
+lib/htmlparser/**
+src/angular.bind.js
+src/ngParseExt/ucd.js
+i18n/closure/**
+tmp/**

.eslintrc-base.json

@@ -0,0 +1,117 @@
+{
+  "rules": {
+    // Rules are divided into sections from http://eslint.org/docs/rules/
+
+    // Possible errors
+    "comma-dangle": ["error", "never"],
+    "no-cond-assign": ["error", "except-parens"],
+    "no-constant-condition": ["error", {"checkLoops": false}],
+    "no-control-regex": "error",
+    "no-debugger": "error",
+    "no-dupe-args": "error",
+    "no-dupe-keys": "error",
+    "no-duplicate-case": "error",
+    "no-empty-character-class": "error",
+    "no-empty": "error",
+    "no-ex-assign": "error",
+    "no-extra-boolean-cast": "error",
+    "no-extra-semi": "error",
+    "no-func-assign": "error",
+    "no-inner-declarations": "error",
+    "no-invalid-regexp": "error",
+    "no-irregular-whitespace": "error",
+    "no-negated-in-lhs": "error",
+    "no-obj-calls": "error",
+    "no-regex-spaces": "error",
+    "no-sparse-arrays": "error",
+    "no-unreachable": "error",
+    "use-isnan": "error",
+    "no-unsafe-finally": "error",
+    "valid-typeof": "error",
+    "no-unexpected-multiline": "error",
+
+    // Best practices
+    "accessor-pairs": "error",
+    "array-callback-return": "error",
+    "eqeqeq": ["error", "allow-null"],
+    "no-alert": "error",
+    "no-caller": "error",
+    "no-case-declarations": "error",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-extra-label": "error",
+    "no-fallthrough": "error",
+    "no-floating-decimal": "error",
+    "no-implied-eval": "error",
+    "no-invalid-this": "error",
+    "no-iterator": "error",
+    "no-multi-str": "error",
+    "no-new-func": "error",
+    "no-new-wrappers": "error",
+    "no-new": "error",
+    "no-octal-escape": "error",
+    "no-octal": "error",
+    "no-proto": "error",
+    "no-redeclare": "error",
+    "no-return-assign": "error",
+    "no-script-url": "error",
+    "no-self-assign": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-throw-literal": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unused-expressions": "error",
+    "no-unused-labels": "error",
+    "no-useless-call": "error",
+    "no-useless-concat": "error",
+    "no-useless-escape": "error",
+    "no-void": "error",
+    "no-with": "error",
+    "radix": "error",
+    "wrap-iife": ["error", "inside"],
+
+    // Strict mode
+    "strict": ["error", "global"],
+
+    // Variables
+    "no-delete-var": "error",
+    "no-label-var": "error",
+    "no-restricted-globals": ["error", "event"],
+    "no-shadow-restricted-names": "error",
+    "no-undef-init": "error",
+    "no-undef": "error",
+    "no-unused-vars": ["error", { "vars": "local", "args": "none" }],
+
+    // Node.js
+    "handle-callback-err": "error",
+
+    // Stylistic issues
+    "array-bracket-spacing": ["error", "never"],
+    "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+    "comma-style": ["error", "last"],
+    "eol-last": "error",
+    "keyword-spacing": "error",
+    "linebreak-style": ["error", "unix"],
+    "max-len": ["error", { "code": 200, "ignoreComments": true, "ignoreUrls": true }],
+    "new-cap": "error",
+    "new-parens": "error",
+    "no-array-constructor": "error",
+    "no-bitwise": "error",
+    "no-mixed-spaces-and-tabs": "error",
+    "no-multiple-empty-lines": ["error", { "max": 3, "maxEOF": 1 }],
+    "no-whitespace-before-property": "error",
+    "no-spaced-func": "error",
+    "no-trailing-spaces": "error",
+    "no-unneeded-ternary": "error",
+    "quotes": ["error", "single"],
+    "semi-spacing": "error",
+    "semi": "error",
+    "space-before-blocks": ["error", "always"],
+    "space-before-function-paren": ["error", "never"],
+    "space-in-parens": ["error", "never"],
+    "space-infix-ops": "error",
+    "space-unary-ops": ["error", { "words": true, "nonwords": false }],
+    "unicode-bom": ["error", "never"]
+  }
+}

.eslintrc-browser.json

@@ -0,0 +1,17 @@
+{
+  "extends": "./.eslintrc-base.json",
+
+  "env": {
+    // Note: don't set `"browser": true`; code in "src/" should be compatible with
+    // non-browser environments like Node.js with a custom window implementation
+    // like jsdom. All browser globals should be taken from window.
+    "browser": false,
+    "node": false
+  },
+
+  "globals": {
+    "window": false,
+
+    "angular": false
+  }
+}

.eslintrc-node.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./.eslintrc-base.json",
+
+  "env": {
+    "browser": false,
+    "node": true
+  }
+}

.eslintrc-todo.json

@@ -0,0 +1,25 @@
+{
+  // This config contains proposed rules that we'd like to have enabled but haven't
+  // converted the code to adhere yet. If a decision comes to not enable one of these
+  // rules, it should be removed from the file. Every rule that got enabled in the
+  // end should be moved from here to a respective section in .eslintrc.json
+
+  "rules": {
+    // Rules are divided into sections from http://eslint.org/docs/rules/
+
+    // Best practices
+    "complexity": ["error", 10],
+    "dot-notation": "error",
+    "dot-location": ["error", "property"],
+
+    // Stylistic issues
+    "block-spacing": ["error", "always"],
+    "comma-spacing": "error",
+    "id-blacklist": ["error", "event"],
+    "indent": ["error", 2],
+    "key-spacing": ["error", { "beforeColon": false, "afterColon": true, "mode": "minimum" }],
+    "object-curly-spacing": ["error", "never"],
+    "object-property-newline": ["error", { "allowMultiplePropertiesPerLine": true }],
+    "operator-linebreak": ["error", "after", { "overrides": { "?": "before", ":": "before" }}]
+  }
+}

.eslintrc.json

@@ -0,0 +1,4 @@
+{
+  "root": true,
+  "extends": "./.eslintrc-node.json"
+}

.jscsrc

@@ -1,48 +0,0 @@
-{
-  "excludeFiles": ["src/ngLocale/**"],
-  "disallowKeywords": ["with"],
-  "disallowKeywordsOnNewLine": ["else"],
-  "disallowMixedSpacesAndTabs": true,
-  "disallowMultipleLineStrings": true,
-  "disallowNewlineBeforeBlockStatements": true,
-  "disallowSpaceAfterObjectKeys": true,
-  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
-  "disallowSpaceBeforeBinaryOperators": [","],
-  "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
-  "disallowSpacesInAnonymousFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInCallExpression": true,
-  "disallowSpacesInFunctionDeclaration": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInNamedFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInsideArrayBrackets": true,
-  "requireSpaceBeforeKeywords": [
-    "else",
-    "while",
-    "catch"
-  ],
-  "disallowSpacesInsideParentheses": true,
-  "disallowTrailingComma": true,
-  "disallowTrailingWhitespace": true,
-  "requireCommaBeforeLineBreak": true,
-  "requireLineFeedAtFileEnd": true,
-  "requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
-  "requireSpaceBeforeBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
-  "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
-  "requireSpaceBeforeBlockStatements": true,
-  "requireSpacesInConditionalExpression": {
-    "afterTest": true,
-    "beforeConsequent": true,
-    "afterConsequent": true,
-    "beforeAlternate": true
-  },
-  "requireSpacesInForStatement": true,
-  "requireSpacesInFunction": {
-    "beforeOpeningCurlyBrace": true
-  },
-  "validateLineBreaks": "LF"
-}

.jshintignore

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

.jshintrc

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

.jshintrc-base

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

.nvmrc

@@ -0,0 +1,2 @@
+4
+

CHANGELOG.md

@@ -1,5 +1,278 @@
-<a name="1.5.4"></a>
-# 1.5.4 graduated-sophistry (2016-04-14)
+<a name="1.5.8"></a>
+# 1.5.8 arbitrary-fallbacks (2016-07-22)
+
+
+## Bug Fixes
+
+- **$animate:** do not get affected by custom, enumerable properties on `Object.prototype`
+  ([181e4401](https://github.com/angular/angular.js/commit/181e44019e850e5253378e29415cddf8d768bbef),
+   [#14804](https://github.com/angular/angular.js/issues/14804), [#14830](https://github.com/angular/angular.js/issues/14830))
+- **$compile:** ensure `$doCheck` hooks can be defined in the controller constructor
+  ([3010ed4e](https://github.com/angular/angular.js/commit/3010ed4ee5c2c18b9848b5664639971b9fdc8919),
+   [#14811](https://github.com/angular/angular.js/issues/14811))
+- **$injector:** fix class detection RegExp
+  ([4724d56c](https://github.com/angular/angular.js/commit/4724d56c939d02675433e7fe554608dff97ecf81),
+   [#14533](https://github.com/angular/angular.js/issues/14533))
+- **$jsonpCallbacks:** do not overwrite callbacks added by other apps
+  ([1778d347](https://github.com/angular/angular.js/commit/1778d347cd3c91335e3840eaa49f1e387db8602f),
+   [#14824](https://github.com/angular/angular.js/issues/14824))
+- **$timeout:** make $flush handle new $timeouts added in $timeout callbacks
+  ([1a387ba5](https://github.com/angular/angular.js/commit/1a387ba5dd1a8a831486fce23f6795bd1eef3d8b),
+   [#5420](https://github.com/angular/angular.js/issues/5420), [#14686](https://github.com/angular/angular.js/issues/14686))
+- **copy:** fix handling of typed subarrays
+  ([1645924d](https://github.com/angular/angular.js/commit/1645924d49a7905ce55cced4c4276654970bb226),
+   [#14842](https://github.com/angular/angular.js/issues/14842), [#14845](https://github.com/angular/angular.js/issues/14845))
+- **modules:** allow modules to be loaded in any order when using `angular-loader`
+  ([98e4a220](https://github.com/angular/angular.js/commit/98e4a220fe8301cec35498ae592adc0266f12437),
+   [#9140](https://github.com/angular/angular.js/issues/9140), [#14794](https://github.com/angular/angular.js/issues/14794))
+- **ngAnimate:** allow removal of class that is scheduled to be added with requestAnimationFrame
+  ([7ccfe92b](https://github.com/angular/angular.js/commit/7ccfe92bed7361832f1b8d25b1a8411eb24d3fb5),
+   [#14582](https://github.com/angular/angular.js/issues/14582))
+- **ngMocks:** allow `ErrorAddingDeclarationLocationStack` to be recognized as an `Error`
+  ([c6074dc3](https://github.com/angular/angular.js/commit/c6074dc34c31a07269bf7f628b971ef6dc805f17),
+   [#13821](https://github.com/angular/angular.js/issues/13821), [#14344](https://github.com/angular/angular.js/issues/14344))
+- **ngOptions:** don't duplicate groups with falsy values
+  ([c3bfd7f5](https://github.com/angular/angular.js/commit/c3bfd7f59d0ecbf4ba3253fb407e683c7bb0766c))
+- **ngTransclude:**
+  - ensure that fallback content is compiled and linked correctly
+  ([c405f88b](https://github.com/angular/angular.js/commit/c405f88bbc743f41591f6f3cfc022eea3c6c34ad),
+   [#14787](https://github.com/angular/angular.js/issues/14787))
+  - only compile fallback content if necessary
+  ([159a68ec](https://github.com/angular/angular.js/commit/159a68ec7ba77e9128b0d0516b813ed3d223b6e3),
+   [#14768](https://github.com/angular/angular.js/issues/14768), [#14765](https://github.com/angular/angular.js/issues/14765), [#14775](https://github.com/angular/angular.js/issues/14775))
+
+
+## Features
+
+- **$compile:** backport $doCheck
+  ([de59ca71](https://github.com/angular/angular.js/commit/de59ca71072eac95ee68de308f92bc5f921dd07b),
+   [#14656](https://github.com/angular/angular.js/issues/14656))
+- **$jsonpCallbacks:** new service to abstract how JSONP callbacks are handled
+  ([a8cacfe9](https://github.com/angular/angular.js/commit/a8cacfe938287c54ce7099125cb735ad53f4c7c2),
+   [#14795](https://github.com/angular/angular.js/issues/14795))
+- **$q:** implement $q.race
+  ([b9a56d58](https://github.com/angular/angular.js/commit/b9a56d588f8b597b1dff30d8e184b7c37d94cdcf),
+   [#12929](https://github.com/angular/angular.js/issues/12929), [#14757](https://github.com/angular/angular.js/issues/14757))
+- **$resource:** pass the resource to a dynamic param functions
+  ([a126fcfe](https://github.com/angular/angular.js/commit/a126fcfee3bd8b02869bd2542c73e1eb21afe927),
+   [#4899](https://github.com/angular/angular.js/issues/4899))
+- **$swipe:** add pointer support
+  ([f797f83c](https://github.com/angular/angular.js/commit/f797f83cd66f1fd11b3c9399e7894217ffa06c38),
+   [#14061](https://github.com/angular/angular.js/issues/14061), [#14791](https://github.com/angular/angular.js/issues/14791))
+- **filterFilter:** allow overwriting the special `$` property name
+  ([33514ec3](https://github.com/angular/angular.js/commit/33514ec384d676d84b2a445bc15bae38c8c3ac8d),
+   [#13313](https://github.com/angular/angular.js/issues/13313))
+
+
+## Performance Improvements
+
+- **$compile:** wrap try/catch of collect comment directives into a function to avoid V8 deopt
+  ([acd45518](https://github.com/angular/angular.js/commit/acd455181de1cfa6b34d75f8d71a6c0b6995a777),
+   [#14848](https://github.com/angular/angular.js/issues/14848))
+
+
+<a name="1.2.30"></a>
+# 1.2.30 patronal-resurrection (2016-07-21)
+
+
+_**Note:** This release contains some security fixes that required breaking changes. Since the
+legacy 1.2.x branch is the only version branch that supports IE8, it was necessary to introduce a
+couple of low-impact breaking changes in a patch release - something we generally avoid - in order
+to make the fixes available to people that still need IE8 support._
+
+## Bug Fixes
+
+- **$compile:**
+  - secure `link[href]` as a `RESOURCE_URL`s in `$sce`
+  ([f35f334b](https://github.com/angular/angular.js/commit/f35f334bd3197585bdf034f4b6d9ffa3122dac62),
+   [#14687](https://github.com/angular/angular.js/issues/14687))
+  - properly sanitize `xlink:href` attribute interoplation
+  ([f2fa1ed8](https://github.com/angular/angular.js/commit/f2fa1ed83d18d4e79a36f8c0db1c2524d762e513),
+   [2687c261](https://github.com/angular/angular.js/commit/2687c26140585d9e3716f9f559390f5d8d598fdf))
+- **ngSanitize:** blacklist the attribute `usemap` as it can be used as a security exploit
+  ([ac0d5286](https://github.com/angular/angular.js/commit/ac0d5286b8931633d774080d6396fb4825d8be33),
+   [#14903](https://github.com/angular/angular.js/issues/14903))
+- **ngAnimate:** do not use event.timeStamp anymore for time tracking
+  ([8d83b563](https://github.com/angular/angular.js/commit/8d83b5633471c847d58f337426fe069797dd49d9),
+   [#13494](https://github.com/angular/angular.js/issues/13494), [#13495](https://github.com/angular/angular.js/issues/13495))
+
+
+## Breaking Changes
+
+- **$compile:** due to [f35f334b](https://github.com/angular/angular.js/commit/f35f334bd3197585bdf034f4b6d9ffa3122dac62),
+
+`link[href]` attributes are now protected via `$sce`, which prevents interpolated values that fail
+the `RESOURCE_URL` context tests from being used in interpolation. For example if the application is
+running at `https://mydomain.org/` then the following will fail:
+
+```html
+<link rel="stylesheet" href="{{ 'https://otherdomain.org/unsafe.css' }}" />
+```
+
+By default, `RESOURCE_URL` safe URLs are only allowed from the same domain and protocol as the
+application document. To use URLs from other domains and/or protocols, you may either whitelist them
+using `$sceDelegateProvider.resourceUrlWhitelist(...)` or wrap them into a trusted value by calling
+`$sce.trustAsResourceUrl(url)`.
+
+- **ngSanitize:** due to [234053fc](https://github.com/angular/angular.js/commit/234053fc9ad90e0d05be7e8359c6af66be94c094),
+
+The `$sanitize` service will now 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.
+
+
+<a name="1.5.7"></a>
+# 1.5.7 hexagonal-circumvolution (2016-06-15)
+
+
+## Bug Fixes
+
+- **$compile:**
+  - don't add merged attributes twice to $attrs
+  ([ebbaa4ac](https://github.com/angular/angular.js/commit/ebbaa4ac5e3559df9267203438a0bb18c2d3b7d8),
+   [#8159](https://github.com/angular/angular.js/issues/8159), [#14737](https://github.com/angular/angular.js/issues/14737))
+  - cope with `$onChanges` hooks throwing
+  ([3749c858](https://github.com/angular/angular.js/commit/3749c85829406ca57cc5729e80696c7f34134068),
+   [#14444](https://github.com/angular/angular.js/issues/14444), [#14463](https://github.com/angular/angular.js/issues/14463))
+- **$parse:** allow arguments to contain filter chains
+  ([cc6dcb4b](https://github.com/angular/angular.js/commit/cc6dcb4bc28aadff4f62d76d6451b0f80b928e69),
+   [#4175](https://github.com/angular/angular.js/issues/4175), [#4168](https://github.com/angular/angular.js/issues/4168), [#14720](https://github.com/angular/angular.js/issues/14720))
+- **$routeProvider:** do not deep-copy route definition objects
+  ([6d0dcca6](https://github.com/angular/angular.js/commit/6d0dcca6f18a353a12c356dc96e05475d351b795),
+   [#14478](https://github.com/angular/angular.js/issues/14478), [#14699](https://github.com/angular/angular.js/issues/14699), [#14750](https://github.com/angular/angular.js/issues/14750))
+- **input[email]:** improve email address validation
+  ([f423dc6b](https://github.com/angular/angular.js/commit/f423dc6b51a9b4a09728a287a2cabda7d45f192e),
+   [#14719](https://github.com/angular/angular.js/issues/14719))
+- **ngMessages:** create new scope for ngMessage, clean it up correctly
+  ([56f33af8](https://github.com/angular/angular.js/commit/56f33af89045e2ec18d144d9d1ef73affbe51959),
+   [#14307](https://github.com/angular/angular.js/issues/14307))
+- **ngMessagesInclude:** don't break on empty (or whitespace-only) templates
+  ([01b8772c](https://github.com/angular/angular.js/commit/01b8772cca55916376355a2ae58d3ab7832a4bc2),
+   [#12941](https://github.com/angular/angular.js/issues/12941), [#14726](https://github.com/angular/angular.js/issues/14726))
+- **ngMock#$controller:** properly assign bindings to all types of controllers (e.g. class-based)
+  ([db58801a](https://github.com/angular/angular.js/commit/db58801a55c91df755414387dc00fee5902bb5f3),
+   [#14437](https://github.com/angular/angular.js/issues/14437), [#14439](https://github.com/angular/angular.js/issues/14439))
+- **ngMockE2E:** allow $httpBackend.passThrough() to work when ngMock is loaded
+  ([6685043a](https://github.com/angular/angular.js/commit/6685043ad40acc50d7088f87e2a71f76d2265306),
+   [#1434](https://github.com/angular/angular.js/issues/1434), [#13124](https://github.com/angular/angular.js/issues/13124))
+- **ngSanitize:** call attribute setter in linky for all links
+  ([c4fad6ad](https://github.com/angular/angular.js/commit/c4fad6ad617af025984ca401054f7b402aa28f1d),
+   [#14707](https://github.com/angular/angular.js/issues/14707))
+
+
+## Features
+
+- **limitTo:** add support for array-like objects
+  ([b03957f0](https://github.com/angular/angular.js/commit/b03957f0047fcfe996abc8efe97f9e2be2c2e13a),
+   [#14657](https://github.com/angular/angular.js/issues/14657), [#14694](https://github.com/angular/angular.js/issues/14694))
+- **orderBy:** add support for custom comparators
+  ([2e33d170](https://github.com/angular/angular.js/commit/2e33d170be7eb72f40fd57a8f66631583572fbf2),
+   [#13238](https://github.com/angular/angular.js/issues/13238), [#14455](https://github.com/angular/angular.js/issues/14455), [#5123](https://github.com/angular/angular.js/issues/5123), [#8112](https://github.com/angular/angular.js/issues/8112), [#10368](https://github.com/angular/angular.js/issues/10368), [#14468](https://github.com/angular/angular.js/issues/14468))
+
+
+<a name="1.5.6"></a>
+# 1.5.6 arrow-stringification (2016-05-27)
+
+
+## Bug Fixes
+
+- **$browser:** set the url even if the browser transforms it
+  ([743b33ab](https://github.com/angular/angular.js/commit/743b33ab9d8cdb8aa6ff28028a54ac0023f4dc15),
+   [#14427](https://github.com/angular/angular.js/issues/14427), [#14499](https://github.com/angular/angular.js/issues/14499))
+- **$compile:**
+  - properly bind context to linking functions for directives with `templateUrl`
+  ([5ae72dc7](https://github.com/angular/angular.js/commit/5ae72dc7affb252774b7c4cbf278269c5e178f38))
+  - always use the DDO as `this` in pre-/post-linking functions
+  ([47bc98a1](https://github.com/angular/angular.js/commit/47bc98a1eafd7853babc1a7dc54f13363a3f4a43),
+   [#9306](https://github.com/angular/angular.js/issues/9306))
+  - don't run unnecessary update to one-way bindings
+  ([30479647](https://github.com/angular/angular.js/commit/304796471292f9805b9cf77e51aacc9cfbb09921),
+   [#14546](https://github.com/angular/angular.js/issues/14546), [#14580](https://github.com/angular/angular.js/issues/14580))
+  - removing unnecessary white space in element-transclusion comments
+  ([1116a96d](https://github.com/angular/angular.js/commit/1116a96df662c95aa83ab527c479b644a14532b6),
+   [#14549](https://github.com/angular/angular.js/issues/14549), [#14550](https://github.com/angular/angular.js/issues/14550))
+  - properly handle setting `srcset` to undefined
+  ([308f22ba](https://github.com/angular/angular.js/commit/308f22ba9a803967ce84c995d810990c80478f6f),
+   [#14470](https://github.com/angular/angular.js/issues/14470), [#14493](https://github.com/angular/angular.js/issues/14493))
+- **$injector:**
+  - add workaround for class stringification in Chrome v50/51
+  ([7550b7bd](https://github.com/angular/angular.js/commit/7550b7bda8d992cc6ed3c65b1f9f7e323a09cae4),
+   [#14531](https://github.com/angular/angular.js/issues/14531))
+  - add workaround for fat-arrow stringification in Chrome v50/51
+  ([bb730704](https://github.com/angular/angular.js/commit/bb730704f2f3dea4620e7b40083dcd65f208e2b2),
+   [#14487](https://github.com/angular/angular.js/issues/14487), [#14495](https://github.com/angular/angular.js/issues/14495))
+- **$templateRequest:** trust empty templates in `$templateCache` as well
+  ([10955969](https://github.com/angular/angular.js/commit/10955969620248bd31a0bd37bc9fd7cc3b1f5e88),
+   [#14479](https://github.com/angular/angular.js/issues/14479), [#14496](https://github.com/angular/angular.js/issues/14496))
+- **filters:** always call `splice()` with 2 arguments or more
+  ([6f1fae8a](https://github.com/angular/angular.js/commit/6f1fae8a916cc6f26725f64869f86fcd4991e819),
+   [#14467](https://github.com/angular/angular.js/issues/14467), [#14489](https://github.com/angular/angular.js/issues/14489))
+- **ng-bind-html:** watch the unwrapped value using `$sce.valueOf()` (instead of `toString()`)
+  ([1c1c9b27](https://github.com/angular/angular.js/commit/1c1c9b27cbb57b3219d4c9765eeea8a11553d297),
+   [#14526](https://github.com/angular/angular.js/issues/14526), [#14527](https://github.com/angular/angular.js/issues/14527))
+- **ngAnimate:**
+  - don't break on anchored animations without duration
+  ([21b76aed](https://github.com/angular/angular.js/commit/21b76aed06d9cc04bd25a99c23ba852af782b357),
+   [#14641](https://github.com/angular/angular.js/issues/14641), [#14645](https://github.com/angular/angular.js/issues/14645))
+  - properly handle empty jqLite collections
+  ([9f480257](https://github.com/angular/angular.js/commit/9f4802573348401ee24090f815f3138fa17c161d),
+   [#14558](https://github.com/angular/angular.js/issues/14558), [#14559](https://github.com/angular/angular.js/issues/14559))
+- **ngMessages:** do not compile ngMessagesInclude template if scope is destroyed
+  ([69d9072d](https://github.com/angular/angular.js/commit/69d9072d5b5aba988ac8a9717c92ce1fac465cbe),
+   [#12695](https://github.com/angular/angular.js/issues/12695), [#14640](https://github.com/angular/angular.js/issues/14640))
+- **ngMock:**
+  - match HTTP request regardless of the order of query params
+  ([363fb16c](https://github.com/angular/angular.js/commit/363fb16c1076a806bb31006daaf583ab5c82e467),
+   [#12762](https://github.com/angular/angular.js/issues/12762))
+  - pass eventHandlers to $httpBackend if passThrough is active
+  ([147650b3](https://github.com/angular/angular.js/commit/147650b3beae7ad8b556a930129887d187a0f5d3),
+   [#14471](https://github.com/angular/angular.js/issues/14471))
+
+
+## Features
+
+- **$compile:** support omitting required controller name if same as the local name
+  ([8965d57a](https://github.com/angular/angular.js/commit/8965d57aa0788c96859cf3cfa0f78b46d2cebedb),
+   [#14513](https://github.com/angular/angular.js/issues/14513))
+- **$parse:** Add support for ES6 object initializers
+  ([1c9b9e24](https://github.com/angular/angular.js/commit/1c9b9e24ede7efc10ce4d53c6ab5528cc77e79d7))
+
+
+## Performance Improvements
+
+- **$rootScope:** make queues more efficient
+  ([51b78f61](https://github.com/angular/angular.js/commit/51b78f61f954d94dc937f57190c9f881df9ab3ad),
+   [#14545](https://github.com/angular/angular.js/issues/14545))
+- **ngAnimate:** listen for document visibility changes
+  ([b377d6b0](https://github.com/angular/angular.js/commit/b377d6b043db9c8da4e68493892f75a0f9759464),
+   [#14568](https://github.com/angular/angular.js/issues/14568))
+- **ngClass:** improve even-odd checking
+  ([cf1b1755](https://github.com/angular/angular.js/commit/cf1b175508a72d4b7e3d64b8506903096c6ec25f))
+
+
+<a name="1.5.5"></a>
+# 1.5.5 material-conspiration (2016-04-18)
+
+
+## Reverts
+
+- **$compile:** move setting of controller data to single location
+  Reverted commit [21d148ae](https://github.com/angular/angular.js/commit/21d148aedc29c7efba4131ff2ef6383b4700868c)
+  since it caused the Angular Material tabs directive to fail.
+
+- **ngRoute:** allow `ngView` to be included in an asynchronously loaded template
+  Eagerly loading `$route`, could break tests, because it might request the root or default route
+  template (something `$httpBackend` would know nothing about).
+
+  It will be re-applied for `v1.6.x`, with a breaking change notice and possibly a way to disable
+  the feature in tests.
+
+  ([8237482d](https://github.com/angular/angular.js/commit/8237482d49e76e2c4994fe6207e3c9799ef04163),
+   [#1213](https://github.com/angular/angular.js/issues/1213), [#6812](https://github.com/angular/angular.js/issues/6812),
+   [#14088](https://github.com/angular/angular.js/issues/14088))
 
 
 ## Bug Fixes
@@ -40,6 +313,9 @@
 - **ngOptions:** set select value when model matches disabled option
   ([832eba5f](https://github.com/angular/angular.js/commit/832eba5fc952312e6b99127123e6e75bdf729006),
    [#12756](https://github.com/angular/angular.js/issues/12756))
+- **$http:** pass event object to `eventHandlers`/`uploadEventHandlers`
+  ([25d4e5cc](https://github.com/angular/angular.js/commit/25d4e5cca4fa615e49d65976223c6deb5b485b4c),
+   [#14436](https://github.com/angular/angular.js/issues/14436))
 
 
 ## Features
@@ -80,6 +356,10 @@
    [#13607](https://github.com/angular/angular.js/issues/13607), [#13239](https://github.com/angular/angular.js/issues/13239), [#12076](https://github.com/angular/angular.js/issues/12076))
 
 
+<a name="1.5.4"></a>
+# 1.5.4 graduated-sophistry (2016-04-14)
+
+This was a partially published release that you should ignore.
 
 <a name="1.5.3"></a>
 # 1.5.3 diplohaplontic-meiosis (2016-03-25)
@@ -407,7 +687,8 @@ changes section for more information
 
 - **ngSanitize:** due to [234053fc](https://github.com/angular/angular.js/commit/234053fc9ad90e0d05be7e8359c6af66be94c094),
 
-The `$sanitize` service will now remove instances of the `usemap` attribute from any elements passed to it.
+The `$sanitize` service will now 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
@@ -983,9 +1264,6 @@ is  `$locals`.
    [#13236](https://github.com/angular/angular.js/issues/13236))
 
 
-## Breaking Changes
-
-
 <a name="1.5.0-beta.2"></a>
 # 1.5.0-beta.2 effective-delegation (2015-11-17)
 
@@ -1305,9 +1583,6 @@ requirement more strict and alerts the developer explicitly.
    [#2318](https://github.com/angular/angular.js/issues/2318), [#9319](https://github.com/angular/angular.js/issues/9319), [#12159](https://github.com/angular/angular.js/issues/12159))
 
 
-## Breaking Changes
-
-
 <a name="1.3.20"></a>
 # 1.3.20 shallow-translucence (2015-09-29)
 
@@ -1318,9 +1593,6 @@ requirement more strict and alerts the developer explicitly.
   ([d434f3db](https://github.com/angular/angular.js/commit/d434f3db53d6209eb140b904e83bbde401686c16))
 
 
-## Breaking Changes
-
-
 <a name="1.2.29"></a>
 # 1.2.29 ultimate-deprecation (2015-09-29)
 
@@ -1347,7 +1619,15 @@ requirement more strict and alerts the developer explicitly.
    [#9936](https://github.com/angular/angular.js/issues/9936))
 
 
-## Breaking Changes
+<a name="1.5.0-beta.0"></a>
+
+# 1.5.0-beta.0 intialization-processation (2015-09-17)
+
+## Bug Fixes
+
+- **jqLite:**: properly handle dash-delimited node names in `jqLiteBuildFragment`
+  ([cdd1227a3](https://github.com/angular/angular.js/commit/cdd1227a308edd34d31b67f338083b6e0c4c0db9),
+  [#10617](https://github.com/angular/angular.js/issues/10617))
 
 
 <a name="1.4.6"></a>
@@ -1900,6 +2180,44 @@ describe('$q.when', function() {
    [#11580](https://github.com/angular/angular.js/issues/11580), [#12234](https://github.com/angular/angular.js/issues/12234))
 
 
+## Breaking Changes
+
+- **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/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()`:
+
+angular.module('myApp', []).config(function($sceDelegateProvider) {
+  $sceDelegateProvider.resourceUrlWhitelist(['self', 'https://example.com/**'])
+});
+```
+
 
 <a name="1.3.17"></a>
 # 1.3.17 tsktskskly-euouae (2015-07-06)
@@ -2178,9 +2496,7 @@ describe('$q.when', function() {
 
 ## Breaking Changes
 
-### ngAnimate
-
-- **$animateCss:** due to [d5683d21](https://github.com/angular/angular.js/commit/d5683d21165e725bc5a850e795f681b0a8a008f5),
+- **ngAnimate** - $animateCss: due to [d5683d21](https://github.com/angular/angular.js/commit/d5683d21165e725bc5a850e795f681b0a8a008f5),
   The $animateCss service will now always return an
 object even if the animation is not set to run. If your code is using
 $animateCss then please consider the following code change:
@@ -2264,9 +2580,7 @@ $animateProvider.classNameFilter(/ng-animate-special/);
 ```
 
 
-### ngOptions
-
-- ** due to [dfa722a8](https://github.com/angular/angular.js/commit/dfa722a8a6864793fd9580d8ae704a06d10b5509),
+- **ngOptions**: due to [dfa722a8](https://github.com/angular/angular.js/commit/dfa722a8a6864793fd9580d8ae704a06d10b5509),
 
 
 Although it is unlikely that anyone is using it in this way, this change does change the

CONTRIBUTING.md

@@ -14,14 +14,17 @@ today! Here are the guidelines we'd like you to follow:
  - [Further Info](#info)
 
 ## <a name="coc"></a> Code of Conduct
+
 Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc].
 
 ## <a name="question"></a> Got a Question or Problem?
 
 If you have questions about how to use AngularJS, please direct these to the [Google Group][groups]
-discussion list or [StackOverflow][stackoverflow]. We are also available on [IRC][irc] and [Gitter][gitter].
+discussion list or [StackOverflow][stackoverflow]. We are also available on [IRC][irc] and
+[Gitter][gitter].
 
 ## <a name="issue"></a> Found an Issue?
+
 If you find a bug in the source code or a mistake in the documentation, you can help us by
 submitting an issue to our [GitHub Repository][github]. Even better you can submit a Pull Request
 with a fix.
@@ -30,46 +33,53 @@ with a fix.
 any changes to these files would be lost the next time that we import the library. The recommended
 approach is to submit a patch to the I18N project directly, instead of submitting it here.*
 
-**Please see the Submission Guidelines below**.
+**Please see the [Submission Guidelines](#submit) below.**
 
 ## <a name="feature"></a> Want a Feature?
+
 You can request a new feature by submitting an issue to our [GitHub Repository][github].  If you
 would like to implement a new feature then consider what kind of change it is:
 
 * **Major Changes** that you wish to contribute to the project should be discussed first on our
-[dev mailing list][angular-dev] or [IRC][irc] so that we can better coordinate our efforts, prevent
-duplication of work, and help you to craft the change so that it is successfully accepted into the
-project.
-* **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a Pull Request.
+  [dev mailing list][angular-dev] or [IRC][irc] so that we can better coordinate our efforts,
+  prevent duplication of work, and help you to craft the change so that it is successfully accepted
+  into the project.
+* **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a Pull
+  Request.
 
 
 ## <a name="docs"></a> Want a Doc Fix?
+
 If you want to help improve the docs, it's a good idea to let others know what you're working on to
-minimize duplication of effort. Before starting, check out the issue queue for
-[Milestone:Docs Only](https://github.com/angular/angular.js/issues?milestone=24&state=open).
-Comment on an issue to let others know what you're working on, or create a new issue if your work
-doesn't fit within the scope of any of the existing doc fix projects.
+minimize duplication of effort. Create a new issue (or comment on a related existing one) to let
+others know what you're working on.
 
-For large fixes, please build and test the documentation before submitting the PR to be sure you haven't
-accidentally introduced any layout or formatting issues. You should also make sure that your commit message
-is labeled "docs:" and follows the **Git Commit Guidelines** outlined below.
+For large fixes, please build and test the documentation before submitting the PR to be sure you
+haven't accidentally introduced any layout or formatting issues. You should also make sure that your
+commit message starts with "docs" and follows the **[Commit Message Guidelines](#commit)** outlined
+below.
 
-If you're just making a small change, don't worry about filing an issue first. Use the friendly blue "Improve this doc" button at the top right of the doc page to fork the repository in-place and make a quick change on the fly. When naming the commit, it is advised to still label it according to the commit guidelines below, by starting the commit message with **docs** and referencing the filename. Since this is not obvious and some changes are made on the fly, this is not strictly necessary and we will understand if this isn't done the first few times.
+If you're just making a small change, don't worry about filing an issue first. Use the friendly blue
+"Improve this doc" button at the top right of the doc page to fork the repository in-place and make
+a quick change on the fly. When naming the commit, it is advised to follow the commit message
+guidelines below, by starting the commit message with **docs** and referencing the filename. Since
+this is not obvious and some changes are made on the fly, this is not strictly necessary and we will
+understand if this isn't done the first few times.
 
 ## <a name="submit"></a> Submission Guidelines
 
 ### Submitting an Issue
 Before you submit your issue search the archive, maybe your question was already answered.
 
-If your issue appears to be a bug, and hasn't been reported, open a new issue.
-Help us to maximize the effort we can spend fixing issues and adding new
-features, by not reporting duplicate issues.  Providing the following information will increase the
-chances of your issue being dealt with quickly:
+If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize
+the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
+Providing the following information will increase the chances of your issue being dealt with
+quickly:
 
 * **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
 * **Motivation for or Use Case** - explain why this is a bug for you
 * **Angular Version(s)** - is it a regression?
-* **Browsers and Operating System** - is this a problem with all browsers or only IE8?
+* **Browsers and Operating System** - is this a problem with all browsers or only specific ones?
 * **Reproduce the Error** - provide a live example (using [Plunker][plunker] or
   [JSFiddle][jsfiddle]) or an unambiguous set of steps.
 * **Related Issues** - has a similar issue been reported before?
@@ -89,22 +99,22 @@ Before you submit your pull request consider the following guidelines:
   requests. We cannot accept code without this.
 * Make your changes in a new git branch:
 
-     ```shell
-     git checkout -b my-fix-branch master
-     ```
+    ```shell
+    git checkout -b my-fix-branch master
+    ```
 
 * Create your patch, **including appropriate test cases**.
 * Follow our [Coding Rules](#rules).
 * Run the full Angular test suite, as described in the [developer documentation][dev-doc],
   and ensure that all tests pass.
 * Commit your changes using a descriptive commit message that follows our
-  [commit message conventions](#commit-message-format) and passes our commit message presubmit hook
-  `validate-commit-msg.js`. Adherence to the [commit message conventions](#commit-message-format)
-  is required because release notes are automatically generated from these messages.
+  [commit message conventions](#commit) and passes our commit message presubmit hook
+  (`validate-commit-msg.js`). Adherence to the [commit message conventions](#commit) is required,
+  because release notes are automatically generated from these messages.
 
-     ```shell
-     git commit -a
-     ```
+    ```shell
+    git commit -a
+    ```
   Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
 
 * Build your changes locally to ensure all the tests pass:
@@ -119,22 +129,24 @@ Before you submit your pull request consider the following guidelines:
     git push origin my-fix-branch
     ```
 
-* In GitHub, send a pull request to `angular:master`.
-* If we suggest changes then:
-  * Make the required updates.
-  * Re-run the Angular test suite to ensure tests are still passing.
-  * Commit your changes to your branch (e.g. `my-fix-branch`).
-  * Push the changes to your GitHub repository (this will update your Pull Request).
+In GitHub, send a pull request to `angular:master`.
+If we suggest changes, then:
+
+* Make the required updates.
+* Re-run the Angular test suite to ensure tests are still passing.
+* Commit your changes to your branch (e.g. `my-fix-branch`).
+* Push the changes to your GitHub repository (this will update your Pull Request).
 
 If the PR gets too outdated we may ask you to rebase and force push to update the PR:
 
-    ```shell
-    git rebase master -i
-    git push origin my-fix-branch -f
-    ```
+```shell
+git rebase master -i
+git push origin my-fix-branch -f
+```
 
-*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments
-on code that were previously made by you and others in your commits.*
+_WARNING: Squashing or reverting commits and force-pushing thereafter may remove GitHub comments
+on code that were previously made by you or others in your commits. Avoid any form of rebasing
+unless necessary._
 
 That's it! Thank you for your contribution!
 
@@ -168,6 +180,7 @@ from the main (upstream) repository:
     ```
 
 ## <a name="rules"></a> Coding Rules
+
 To ensure consistency throughout the source code, keep these rules in mind as you are working:
 
 * All features or bug fixes **must be tested** by one or more [specs][unit-testing].
@@ -280,7 +293,7 @@ You can find out more detailed information about contributing in the
 [groups]: https://groups.google.com/forum/?fromgroups#!forum/angular
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
 [irc]: http://webchat.freenode.net/?channels=angularjs&uio=d4
-[js-style-guide]: http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
+[js-style-guide]: https://google.github.io/styleguide/javascriptguide.xml
 [jsfiddle]: http://jsfiddle.net/
 [list]: https://groups.google.com/forum/?fromgroups#!forum/angular
 [ngDocs]: https://github.com/angular/angular.js/wiki/Writing-AngularJS-Documentation

Gruntfile.js

@@ -1,5 +1,8 @@
 'use strict';
 
+var serveFavicon = require('serve-favicon');
+var serveStatic = require('serve-static');
+var serveIndex = require('serve-index');
 var files = require('./angularFiles').files;
 var util = require('./lib/grunt/utils.js');
 var versionInfo = require('./lib/versions/version-info');
@@ -15,7 +18,11 @@ module.exports = function(grunt) {
 
   var NG_VERSION = versionInfo.currentVersion;
   NG_VERSION.cdn = versionInfo.cdnVersion;
-  var dist = 'angular-'+ NG_VERSION.full;
+  var dist = 'angular-' + NG_VERSION.full;
+
+  if (versionInfo.cdnVersion == null) {
+    throw new Error('Unable to read CDN version, are you offline or has the CDN not been properly pushed?');
+  }
 
   //config
   grunt.initConfig({
@@ -34,15 +41,15 @@ module.exports = function(grunt) {
           hostname: '0.0.0.0',
           base: '.',
           keepalive: true,
-          middleware: function(connect, options){
+          middleware: function(connect, options) {
             var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
             return [
               util.conditionalCsp(),
               util.rewrite(),
               e2e.middleware(),
-              connect.favicon('images/favicon.ico'),
-              connect.static(base),
-              connect.directory(base)
+              serveFavicon('images/favicon.ico'),
+              serveStatic(base),
+              serveIndex(base)
             ];
           }
         }
@@ -54,7 +61,7 @@ module.exports = function(grunt) {
           // to avoid https://github.com/joyent/libuv/issues/826
           port: 8000,
           hostname: '0.0.0.0',
-          middleware: function(connect, options){
+          middleware: function(connect, options) {
             var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
             return [
               function(req, resp, next) {
@@ -67,8 +74,8 @@ module.exports = function(grunt) {
               },
               util.conditionalCsp(),
               e2e.middleware(),
-              connect.favicon('images/favicon.ico'),
-              connect.static(base)
+              serveFavicon('images/favicon.ico'),
+              serveStatic(base)
             ];
           }
         }
@@ -79,6 +86,8 @@ module.exports = function(grunt) {
     tests: {
       jqlite: 'karma-jqlite.conf.js',
       jquery: 'karma-jquery.conf.js',
+      'jquery-2.2': 'karma-jquery-2.2.conf.js',
+      'jquery-2.1': 'karma-jquery-2.1.conf.js',
       docs: 'karma-docs.conf.js',
       modules: 'karma-modules.conf.js'
     },
@@ -87,6 +96,8 @@ module.exports = function(grunt) {
     autotest: {
       jqlite: 'karma-jqlite.conf.js',
       jquery: 'karma-jquery.conf.js',
+      'jquery-2.2': 'karma-jquery-2.2.conf.js',
+      'jquery-2.1': 'karma-jquery-2.1.conf.js',
       modules: 'karma-modules.conf.js',
       docs: 'karma-docs.conf.js'
     },
@@ -104,68 +115,24 @@ module.exports = function(grunt) {
       tmp: ['tmp']
     },
 
-    jshint: {
-      options: {
-        jshintrc: true,
-      },
-      node: {
-        files: { src: ['*.js', 'lib/**/*.js'] },
-      },
-      tests: {
-        files: { src: 'test/**/*.js' },
-      },
-      ng: {
-        files: { src: files['angularSrc'].concat('!src/angular.bind.js') },
-      },
-      ngAnimate: {
-        files: { src: 'src/ngAnimate/**/*.js' },
-      },
-      ngCookies: {
-        files: { src: 'src/ngCookies/**/*.js' },
-      },
-      ngLocale: {
-        files: { src: 'src/ngLocale/**/*.js' },
-      },
-      ngMessageFormat: {
-        files: { src: 'src/ngMessageFormat/**/*.js' },
-      },
-      ngMessages: {
-        files: { src: 'src/ngMessages/**/*.js' },
-      },
-      ngMock: {
-        files: { src: 'src/ngMock/**/*.js' },
-      },
-      ngParseExt: {
-        files: { src: 'src/ngParseExt/**/*.js' },
-      },
-      ngResource: {
-        files: { src: 'src/ngResource/**/*.js' },
-      },
-      ngRoute: {
-        files: { src: 'src/ngRoute/**/*.js' },
-      },
-      ngSanitize: {
-        files: { src: 'src/ngSanitize/**/*.js' },
-      },
-      ngScenario: {
-        files: { src: 'src/ngScenario/**/*.js' },
-      },
-      ngTouch: {
-        files: { src: 'src/ngTouch/**/*.js' },
-      },
-      ngAria: {
-        files: {src: 'src/ngAria/**/*.js'},
-      }
-    },
-
-    jscs: {
-      src: [
-        'src/**/*.js',
-        'test/**/*.js',
-        '!src/angular.bind.js' // we ignore this file since contains an early return statement
-      ],
-      options: {
-        config: '.jscsrc'
+    eslint: {
+      all: {
+        src: [
+          '*.js',
+          'benchmarks/**/*.js',
+          'docs/**/*.js',
+          'lib/**/*.js',
+          'scripts/**/*.js',
+          'src/**/*.js',
+          'test/**/*.js',
+          'i18n/**/*.js',
+          '!docs/app/assets/js/angular-bootstrap/**',
+          '!docs/bower_components/**',
+          '!docs/config/templates/**',
+          '!src/angular.bind.js',
+          '!i18n/closure/**',
+          '!src/ngParseExt/ucd.js'
+        ]
       }
     },
 
@@ -238,7 +205,7 @@ module.exports = function(grunt) {
         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']
       }
@@ -307,7 +274,7 @@ module.exports = function(grunt) {
 
     compress: {
       build: {
-        options: {archive: 'build/' + dist +'.zip', mode: 'zip'},
+        options: {archive: 'build/' + dist + '.zip', mode: 'zip'},
         src: ['**'],
         cwd: 'build',
         expand: true,
@@ -355,12 +322,14 @@ module.exports = function(grunt) {
 
 
   //alias tasks
-  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package', 'test:unit', 'test:promises-aplus', 'tests:docs', 'test:protractor']);
+  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['eslint', 'package', 'test:unit', 'test:promises-aplus', 'tests:docs', 'test:protractor']);
   grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
-  grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
+  grunt.registerTask('test:jquery', 'Run the jQuery (latest) unit tests with Karma', ['tests:jquery']);
+  grunt.registerTask('test:jquery-2.2', 'Run the jQuery 2.2 unit tests with Karma', ['tests:jquery-2.2']);
+  grunt.registerTask('test:jquery-2.1', 'Run the jQuery 2.1 unit tests with Karma', ['tests:jquery-2.1']);
   grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['build', 'tests:modules']);
   grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
-  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['test:jqlite', 'test:jquery', 'test:modules']);
+  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['test:jqlite', 'test:jquery', 'test:jquery-2.2', 'test:jquery-2.1', 'test:modules']);
   grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
   grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);
   grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']);
@@ -370,6 +339,6 @@ module.exports = function(grunt) {
   grunt.registerTask('minify', ['bower', 'clean', 'build', 'minall']);
   grunt.registerTask('webserver', ['connect:devserver']);
   grunt.registerTask('package', ['bower', 'validate-angular-files', 'clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
-  grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'jscs']);
+  grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'eslint']);
   grunt.registerTask('default', ['package']);
 };

README.md

@@ -19,6 +19,7 @@ piece of cake. Best of all? It makes development fun!
 * Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
 * Dashboard: https://dashboard.angularjs.org
 
+##### Looking for Angular 2? Go here: https://github.com/angular/angular
 
 Building AngularJS
 ---------

angularFiles.js

@@ -5,6 +5,7 @@ var angularFiles = {
     'src/minErr.js',
     'src/Angular.js',
     'src/loader.js',
+    'src/shallowCopy.js',
     'src/stringify.js',
     'src/AngularPublic.js',
     'src/jqLite.js',
@@ -27,6 +28,7 @@ var angularFiles = {
     'src/ng/httpBackend.js',
     'src/ng/interpolate.js',
     'src/ng/interval.js',
+    'src/ng/jsonpCallbacks.js',
     'src/ng/locale.js',
     'src/ng/location.js',
     'src/ng/log.js',
@@ -78,7 +80,6 @@ var angularFiles = {
     'src/ng/directive/ngTransclude.js',
     'src/ng/directive/script.js',
     'src/ng/directive/select.js',
-    'src/ng/directive/style.js',
     'src/ng/directive/validators.js',
     'src/angular.bind.js',
     'src/publishExternalApis.js',
@@ -128,6 +129,7 @@ var angularFiles = {
       'src/ngResource/resource.js'
     ],
     'ngRoute': [
+      'src/shallowCopy.js',
       'src/ngRoute/route.js',
       'src/ngRoute/routeParams.js',
       'src/ngRoute/directive/ngView.js'
@@ -175,6 +177,7 @@ var angularFiles = {
     'test/auto/*.js',
     'test/ng/**/*.js',
     'test/ngAnimate/*.js',
+    'test/ngMessageFormat/*.js',
     'test/ngMessages/*.js',
     'test/ngCookies/*.js',
     'test/ngResource/*.js',
@@ -206,13 +209,15 @@ var angularFiles = {
     'build/docs/docs-scenario.js'
   ],
 
-  "karmaModules": [
+  'karmaModules': [
     'build/angular.js',
     '@angularSrcModules',
     'test/modules/no_bootstrap.js',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
+    'test/ngAnimate/*.js',
     'test/ngMessageFormat/*.js',
+    'test/ngMessages/*.js',
     'test/ngMock/*.js',
     'test/ngCookies/*.js',
     'test/ngRoute/**/*.js',
@@ -239,6 +244,17 @@ var angularFiles = {
   ]
 };
 
+['2.1', '2.2'].forEach(function(jQueryVersion) {
+  angularFiles['karmaJquery' + jQueryVersion] = []
+    .concat(angularFiles.karmaJquery)
+    .map(function(path) {
+      if (path.startsWith('bower_components/jquery')) {
+        return path.replace(/^bower_components\/jquery/, 'bower_components/jquery-' + jQueryVersion);
+      }
+      return path;
+    });
+});
+
 angularFiles['angularSrcModules'] = [].concat(
   angularFiles['angularModules']['ngAnimate'],
   angularFiles['angularModules']['ngMessageFormat'],
@@ -260,7 +276,7 @@ if (exports) {
     Array.prototype.slice.call(arguments, 0).forEach(function(filegroup) {
       angularFiles[filegroup].forEach(function(file) {
         // replace @ref
-        var match = file.match(/^\@(.*)/);
+        var match = file.match(/^@(.*)/);
         if (match) {
           files = files.concat(angularFiles[match[1]]);
         } else {

benchmarks/.eslintrc.json

@@ -0,0 +1,11 @@
+{
+  "root": true,
+  "extends": "../.eslintrc-browser.json",
+
+  "globals": {
+    "benchmarkSteps": false,
+
+    // Benchmarks are not run in IE 9 so we're fine.
+    "console": false
+  }
+}

benchmarks/bootstrap-compile-bp/app.js

@@ -0,0 +1,61 @@
+'use strict';
+
+var app = angular.module('boostrapCompileBenchmark', []);
+
+var commentDirectivesEnabled;
+var cssClassDirectivesEnabled;
+
+app.config(function($compileProvider) {
+  $compileProvider.debugInfoEnabled(false);
+
+  commentDirectivesEnabled = window.location.toString().indexOf('comment=disabled') === -1;
+  cssClassDirectivesEnabled = window.location.toString().indexOf('css=disabled') === -1;
+
+  $compileProvider
+    .commentDirectivesEnabled(commentDirectivesEnabled)
+    .cssClassDirectivesEnabled(cssClassDirectivesEnabled);
+})
+.controller('DataController', function DataController($compile, $http, $rootScope) {
+
+  this.isEA = !commentDirectivesEnabled && !cssClassDirectivesEnabled;
+  this.isEAC = !commentDirectivesEnabled && cssClassDirectivesEnabled;
+  this.isEAM = commentDirectivesEnabled && !cssClassDirectivesEnabled;
+  this.isEACM = commentDirectivesEnabled && cssClassDirectivesEnabled;
+
+  this.repeats = 50;
+
+  this.templates = [
+    'bootstrap-carousel.tpl.html',
+    'bootstrap-theme.tpl.html'
+  ];
+
+  this.html = null;
+  this.loadTemplate = function() {
+    this.html = null;
+    $http.get(window.location.pathname + this.selectedTemplate)
+      .then(function(response) { this.html = response.data; }.bind(this));
+  };
+
+  this.selectedTemplate = this.templates[0];
+  this.loadTemplate();
+
+
+  var linkers = [];
+  benchmarkSteps.push({
+    name: 'create',
+    fn: function() {
+      for (var i = 0; i < this.repeats; i++) {
+        var linker = $compile(this.html);
+        linkers.push(linker);
+      }
+    }.bind(this)
+  });
+
+  benchmarkSteps.push({
+    name: 'destroy',
+    fn: function() {
+      linkers.length = 0;
+    }
+  });
+
+});

benchmarks/bootstrap-compile-bp/bootstrap-carousel.tpl.html

@@ -0,0 +1,172 @@
+<!-- code from http://getbootstrap.com/examples/carousel -->
+<div class="navbar-wrapper">
+  <div class="container">
+
+    <nav class="navbar navbar-inverse navbar-static-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div id="navbar" class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="#">Home</a></li>
+            <li><a href="#about">About</a></li>
+            <li><a href="#contact">Contact</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li role="separator" class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </nav>
+
+  </div>
+</div>
+
+
+<!-- Carousel
+================================================== -->
+<div id="myCarousel" class="carousel slide" data-ride="carousel">
+  <!-- Indicators -->
+  <ol class="carousel-indicators">
+    <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+    <li data-target="#myCarousel" data-slide-to="1"></li>
+    <li data-target="#myCarousel" data-slide-to="2"></li>
+  </ol>
+  <div class="carousel-inner" role="listbox">
+    <div class="item active">
+      <img class="first-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide">
+      <div class="container">
+        <div class="carousel-caption">
+          <h1>Example headline.</h1>
+          <p>Note: If you're viewing this page via a <code>file://</code> URL, the "next" and "previous" Glyphicon buttons on the left and right might not load/display properly due to web browser security rules.</p>
+          <p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
+        </div>
+      </div>
+    </div>
+    <div class="item">
+      <img class="second-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Second slide">
+      <div class="container">
+        <div class="carousel-caption">
+          <h1>Another example headline.</h1>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-lg btn-primary" href="#" role="button">Learn more</a></p>
+        </div>
+      </div>
+    </div>
+    <div class="item">
+      <img class="third-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide">
+      <div class="container">
+        <div class="carousel-caption">
+          <h1>One more for good measure.</h1>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>
+        </div>
+      </div>
+    </div>
+  </div>
+  <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+    <span class="sr-only">Previous</span>
+  </a>
+  <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+    <span class="sr-only">Next</span>
+  </a>
+</div><!-- /.carousel -->
+
+
+<!-- Marketing messaging and featurettes
+================================================== -->
+<!-- Wrap the rest of the page in another container to center all the content. -->
+
+<div class="container marketing">
+
+  <!-- Three columns of text below the carousel -->
+  <div class="row">
+    <div class="col-lg-4">
+      <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" width="140" height="140">
+      <h2>Heading</h2>
+      <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
+      <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
+    </div><!-- /.col-lg-4 -->
+    <div class="col-lg-4">
+      <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" width="140" height="140">
+      <h2>Heading</h2>
+      <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
+      <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
+    </div><!-- /.col-lg-4 -->
+    <div class="col-lg-4">
+      <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" width="140" height="140">
+      <h2>Heading</h2>
+      <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
+      <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
+    </div><!-- /.col-lg-4 -->
+  </div><!-- /.row -->
+
+
+  <!-- START THE FEATURETTES -->
+
+  <hr class="featurette-divider">
+
+  <div class="row featurette">
+    <div class="col-md-7">
+      <h2 class="featurette-heading">First featurette heading. <span class="text-muted">It'll blow your mind.</span></h2>
+      <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
+    </div>
+    <div class="col-md-5">
+      <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
+    </div>
+  </div>
+
+  <hr class="featurette-divider">
+
+  <div class="row featurette">
+    <div class="col-md-7 col-md-push-5">
+      <h2 class="featurette-heading">Oh yeah, it's that good. <span class="text-muted">See for yourself.</span></h2>
+      <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
+    </div>
+    <div class="col-md-5 col-md-pull-7">
+      <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
+    </div>
+  </div>
+
+  <hr class="featurette-divider">
+
+  <div class="row featurette">
+    <div class="col-md-7">
+      <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Checkmate.</span></h2>
+      <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
+    </div>
+    <div class="col-md-5">
+      <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
+    </div>
+  </div>
+
+  <hr class="featurette-divider">
+
+  <!-- /END THE FEATURETTES -->
+
+
+  <!-- FOOTER -->
+  <footer>
+    <p class="pull-right"><a href="#">Back to top</a></p>
+    <p>&copy; 2016 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
+  </footer>
+
+</div><!-- /.container -->

benchmarks/bootstrap-compile-bp/bootstrap-theme.tpl.html

@@ -0,0 +1,595 @@
+<!-- Fixed navbar -->
+<nav class="navbar navbar-inverse navbar-fixed-top">
+<div class="container">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="#">Bootstrap theme</a>
+  </div>
+  <div id="navbar" class="navbar-collapse collapse">
+    <ul class="nav navbar-nav">
+      <li class="active"><a href="#">Home</a></li>
+      <li><a href="#about">About</a></li>
+      <li><a href="#contact">Contact</a></li>
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+        <ul class="dropdown-menu">
+          <li><a href="#">Action</a></li>
+          <li><a href="#">Another action</a></li>
+          <li><a href="#">Something else here</a></li>
+          <li role="separator" class="divider"></li>
+          <li class="dropdown-header">Nav header</li>
+          <li><a href="#">Separated link</a></li>
+          <li><a href="#">One more separated link</a></li>
+        </ul>
+      </li>
+    </ul>
+  </div><!--/.nav-collapse -->
+</div>
+</nav>
+
+<div class="container theme-showcase" role="main">
+
+<!-- Main jumbotron for a primary marketing message or call to action -->
+<div class="jumbotron">
+  <h1>Theme example</h1>
+  <p>This is a template showcasing the optional theme stylesheet included in Bootstrap. Use it as a starting point to create something more unique by building on or modifying it.</p>
+</div>
+
+
+<div class="page-header">
+  <h1>Buttons</h1>
+</div>
+<p>
+  <button type="button" class="btn btn-lg btn-default">Default</button>
+  <button type="button" class="btn btn-lg btn-primary">Primary</button>
+  <button type="button" class="btn btn-lg btn-success">Success</button>
+  <button type="button" class="btn btn-lg btn-info">Info</button>
+  <button type="button" class="btn btn-lg btn-warning">Warning</button>
+  <button type="button" class="btn btn-lg btn-danger">Danger</button>
+  <button type="button" class="btn btn-lg btn-link">Link</button>
+</p>
+<p>
+  <button type="button" class="btn btn-default">Default</button>
+  <button type="button" class="btn btn-primary">Primary</button>
+  <button type="button" class="btn btn-success">Success</button>
+  <button type="button" class="btn btn-info">Info</button>
+  <button type="button" class="btn btn-warning">Warning</button>
+  <button type="button" class="btn btn-danger">Danger</button>
+  <button type="button" class="btn btn-link">Link</button>
+</p>
+<p>
+  <button type="button" class="btn btn-sm btn-default">Default</button>
+  <button type="button" class="btn btn-sm btn-primary">Primary</button>
+  <button type="button" class="btn btn-sm btn-success">Success</button>
+  <button type="button" class="btn btn-sm btn-info">Info</button>
+  <button type="button" class="btn btn-sm btn-warning">Warning</button>
+  <button type="button" class="btn btn-sm btn-danger">Danger</button>
+  <button type="button" class="btn btn-sm btn-link">Link</button>
+</p>
+<p>
+  <button type="button" class="btn btn-xs btn-default">Default</button>
+  <button type="button" class="btn btn-xs btn-primary">Primary</button>
+  <button type="button" class="btn btn-xs btn-success">Success</button>
+  <button type="button" class="btn btn-xs btn-info">Info</button>
+  <button type="button" class="btn btn-xs btn-warning">Warning</button>
+  <button type="button" class="btn btn-xs btn-danger">Danger</button>
+  <button type="button" class="btn btn-xs btn-link">Link</button>
+</p>
+
+
+<div class="page-header">
+  <h1>Tables</h1>
+</div>
+<div class="row">
+  <div class="col-md-6">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>First Name</th>
+          <th>Last Name</th>
+          <th>Username</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>Mark</td>
+          <td>Otto</td>
+          <td>@mdo</td>
+        </tr>
+        <tr>
+          <td>2</td>
+          <td>Jacob</td>
+          <td>Thornton</td>
+          <td>@fat</td>
+        </tr>
+        <tr>
+          <td>3</td>
+          <td>Larry</td>
+          <td>the Bird</td>
+          <td>@twitter</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="col-md-6">
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>First Name</th>
+          <th>Last Name</th>
+          <th>Username</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>Mark</td>
+          <td>Otto</td>
+          <td>@mdo</td>
+        </tr>
+        <tr>
+          <td>2</td>
+          <td>Jacob</td>
+          <td>Thornton</td>
+          <td>@fat</td>
+        </tr>
+        <tr>
+          <td>3</td>
+          <td>Larry</td>
+          <td>the Bird</td>
+          <td>@twitter</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-6">
+    <table class="table table-bordered">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>First Name</th>
+          <th>Last Name</th>
+          <th>Username</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="2">1</td>
+          <td>Mark</td>
+          <td>Otto</td>
+          <td>@mdo</td>
+        </tr>
+        <tr>
+          <td>Mark</td>
+          <td>Otto</td>
+          <td>@TwBootstrap</td>
+        </tr>
+        <tr>
+          <td>2</td>
+          <td>Jacob</td>
+          <td>Thornton</td>
+          <td>@fat</td>
+        </tr>
+        <tr>
+          <td>3</td>
+          <td colspan="2">Larry the Bird</td>
+          <td>@twitter</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="col-md-6">
+    <table class="table table-condensed">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>First Name</th>
+          <th>Last Name</th>
+          <th>Username</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>Mark</td>
+          <td>Otto</td>
+          <td>@mdo</td>
+        </tr>
+        <tr>
+          <td>2</td>
+          <td>Jacob</td>
+          <td>Thornton</td>
+          <td>@fat</td>
+        </tr>
+        <tr>
+          <td>3</td>
+          <td colspan="2">Larry the Bird</td>
+          <td>@twitter</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+
+<div class="page-header">
+  <h1>Thumbnails</h1>
+</div>
+<img data-src="holder.js/200x200" class="img-thumbnail" alt="200x200" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDIwMCAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzIwMHgyMDAKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTYyY2ExYjA3YiB0ZXh0IHsgZmlsbDojQUFBQUFBO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjEwcHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1NjJjYTFiMDdiIj48cmVjdCB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCIgZmlsbD0iI0VFRUVFRSIvPjxnPjx0ZXh0IHg9Ijc0LjY5NTMxMjUiIHk9IjEwNC41Ij4yMDB4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true" style="width: 200px; height: 200px;">
+
+
+<div class="page-header">
+  <h1>Labels</h1>
+</div>
+<h1>
+  <span class="label label-default">Default</span>
+  <span class="label label-primary">Primary</span>
+  <span class="label label-success">Success</span>
+  <span class="label label-info">Info</span>
+  <span class="label label-warning">Warning</span>
+  <span class="label label-danger">Danger</span>
+</h1>
+<h2>
+  <span class="label label-default">Default</span>
+  <span class="label label-primary">Primary</span>
+  <span class="label label-success">Success</span>
+  <span class="label label-info">Info</span>
+  <span class="label label-warning">Warning</span>
+  <span class="label label-danger">Danger</span>
+</h2>
+<h3>
+  <span class="label label-default">Default</span>
+  <span class="label label-primary">Primary</span>
+  <span class="label label-success">Success</span>
+  <span class="label label-info">Info</span>
+  <span class="label label-warning">Warning</span>
+  <span class="label label-danger">Danger</span>
+</h3>
+<h4>
+  <span class="label label-default">Default</span>
+  <span class="label label-primary">Primary</span>
+  <span class="label label-success">Success</span>
+  <span class="label label-info">Info</span>
+  <span class="label label-warning">Warning</span>
+  <span class="label label-danger">Danger</span>
+</h4>
+<h5>
+  <span class="label label-default">Default</span>
+  <span class="label label-primary">Primary</span>
+  <span class="label label-success">Success</span>
+  <span class="label label-info">Info</span>
+  <span class="label label-warning">Warning</span>
+  <span class="label label-danger">Danger</span>
+</h5>
+<h6>
+  <span class="label label-default">Default</span>
+  <span class="label label-primary">Primary</span>
+  <span class="label label-success">Success</span>
+  <span class="label label-info">Info</span>
+  <span class="label label-warning">Warning</span>
+  <span class="label label-danger">Danger</span>
+</h6>
+<p>
+  <span class="label label-default">Default</span>
+  <span class="label label-primary">Primary</span>
+  <span class="label label-success">Success</span>
+  <span class="label label-info">Info</span>
+  <span class="label label-warning">Warning</span>
+  <span class="label label-danger">Danger</span>
+</p>
+
+
+<div class="page-header">
+  <h1>Badges</h1>
+</div>
+<p>
+  <a href="#">Inbox <span class="badge">42</span></a>
+</p>
+<ul class="nav nav-pills" role="tablist">
+  <li role="presentation" class="active"><a href="#">Home <span class="badge">42</span></a></li>
+  <li role="presentation"><a href="#">Profile</a></li>
+  <li role="presentation"><a href="#">Messages <span class="badge">3</span></a></li>
+</ul>
+
+
+<div class="page-header">
+  <h1>Dropdown menus</h1>
+</div>
+<div class="dropdown theme-dropdown clearfix">
+  <a id="dropdownMenu1" href="#" class="sr-only dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+  <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+    <li class="active"><a href="#">Action</a></li>
+    <li><a href="#">Another action</a></li>
+    <li><a href="#">Something else here</a></li>
+    <li role="separator" class="divider"></li>
+    <li><a href="#">Separated link</a></li>
+  </ul>
+</div>
+
+
+<div class="page-header">
+  <h1>Navs</h1>
+</div>
+<ul class="nav nav-tabs" role="tablist">
+  <li role="presentation" class="active"><a href="#">Home</a></li>
+  <li role="presentation"><a href="#">Profile</a></li>
+  <li role="presentation"><a href="#">Messages</a></li>
+</ul>
+<ul class="nav nav-pills" role="tablist">
+  <li role="presentation" class="active"><a href="#">Home</a></li>
+  <li role="presentation"><a href="#">Profile</a></li>
+  <li role="presentation"><a href="#">Messages</a></li>
+</ul>
+
+
+<div class="page-header">
+  <h1>Navbars</h1>
+</div>
+
+<nav class="navbar navbar-default">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="#">Project name</a>
+    </div>
+    <div class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li class="active"><a href="#">Home</a></li>
+        <li><a href="#about">About</a></li>
+        <li><a href="#contact">Contact</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Action</a></li>
+            <li><a href="#">Another action</a></li>
+            <li><a href="#">Something else here</a></li>
+            <li role="separator" class="divider"></li>
+            <li class="dropdown-header">Nav header</li>
+            <li><a href="#">Separated link</a></li>
+            <li><a href="#">One more separated link</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
+
+<nav class="navbar navbar-inverse">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="#">Project name</a>
+    </div>
+    <div class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li class="active"><a href="#">Home</a></li>
+        <li><a href="#about">About</a></li>
+        <li><a href="#contact">Contact</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Action</a></li>
+            <li><a href="#">Another action</a></li>
+            <li><a href="#">Something else here</a></li>
+            <li role="separator" class="divider"></li>
+            <li class="dropdown-header">Nav header</li>
+            <li><a href="#">Separated link</a></li>
+            <li><a href="#">One more separated link</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
+
+
+<div class="page-header">
+  <h1>Alerts</h1>
+</div>
+<div class="alert alert-success" role="alert">
+  <strong>Well done!</strong> You successfully read this important alert message.
+</div>
+<div class="alert alert-info" role="alert">
+  <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
+</div>
+<div class="alert alert-warning" role="alert">
+  <strong>Warning!</strong> Best check yo self, you're not looking too good.
+</div>
+<div class="alert alert-danger" role="alert">
+  <strong>Oh snap!</strong> Change a few things up and try submitting again.
+</div>
+
+
+<div class="page-header">
+  <h1>Progress bars</h1>
+</div>
+<div class="progress">
+  <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"><span class="sr-only">60% Complete</span></div>
+</div>
+<div class="progress">
+  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%"><span class="sr-only">40% Complete (success)</span></div>
+</div>
+<div class="progress">
+  <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%"><span class="sr-only">20% Complete</span></div>
+</div>
+<div class="progress">
+  <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete (warning)</span></div>
+</div>
+<div class="progress">
+  <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div>
+</div>
+<div class="progress">
+  <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete</span></div>
+</div>
+<div class="progress">
+  <div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div>
+  <div class="progress-bar progress-bar-warning" style="width: 20%"><span class="sr-only">20% Complete (warning)</span></div>
+  <div class="progress-bar progress-bar-danger" style="width: 10%"><span class="sr-only">10% Complete (danger)</span></div>
+</div>
+
+
+<div class="page-header">
+  <h1>List groups</h1>
+</div>
+<div class="row">
+  <div class="col-sm-4">
+    <ul class="list-group">
+      <li class="list-group-item">Cras justo odio</li>
+      <li class="list-group-item">Dapibus ac facilisis in</li>
+      <li class="list-group-item">Morbi leo risus</li>
+      <li class="list-group-item">Porta ac consectetur ac</li>
+      <li class="list-group-item">Vestibulum at eros</li>
+    </ul>
+  </div><!-- /.col-sm-4 -->
+  <div class="col-sm-4">
+    <div class="list-group">
+      <a href="#" class="list-group-item active">
+        Cras justo odio
+      </a>
+      <a href="#" class="list-group-item">Dapibus ac facilisis in</a>
+      <a href="#" class="list-group-item">Morbi leo risus</a>
+      <a href="#" class="list-group-item">Porta ac consectetur ac</a>
+      <a href="#" class="list-group-item">Vestibulum at eros</a>
+    </div>
+  </div><!-- /.col-sm-4 -->
+  <div class="col-sm-4">
+    <div class="list-group">
+      <a href="#" class="list-group-item active">
+        <h4 class="list-group-item-heading">List group item heading</h4>
+        <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
+      </a>
+      <a href="#" class="list-group-item">
+        <h4 class="list-group-item-heading">List group item heading</h4>
+        <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
+      </a>
+      <a href="#" class="list-group-item">
+        <h4 class="list-group-item-heading">List group item heading</h4>
+        <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p>
+      </a>
+    </div>
+  </div><!-- /.col-sm-4 -->
+</div>
+
+
+<div class="page-header">
+  <h1>Panels</h1>
+</div>
+<div class="row">
+  <div class="col-sm-4">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h3 class="panel-title">Panel title</h3>
+      </div>
+      <div class="panel-body">
+        Panel content
+      </div>
+    </div>
+    <div class="panel panel-primary">
+      <div class="panel-heading">
+        <h3 class="panel-title">Panel title</h3>
+      </div>
+      <div class="panel-body">
+        Panel content
+      </div>
+    </div>
+  </div><!-- /.col-sm-4 -->
+  <div class="col-sm-4">
+    <div class="panel panel-success">
+      <div class="panel-heading">
+        <h3 class="panel-title">Panel title</h3>
+      </div>
+      <div class="panel-body">
+        Panel content
+      </div>
+    </div>
+    <div class="panel panel-info">
+      <div class="panel-heading">
+        <h3 class="panel-title">Panel title</h3>
+      </div>
+      <div class="panel-body">
+        Panel content
+      </div>
+    </div>
+  </div><!-- /.col-sm-4 -->
+  <div class="col-sm-4">
+    <div class="panel panel-warning">
+      <div class="panel-heading">
+        <h3 class="panel-title">Panel title</h3>
+      </div>
+      <div class="panel-body">
+        Panel content
+      </div>
+    </div>
+    <div class="panel panel-danger">
+      <div class="panel-heading">
+        <h3 class="panel-title">Panel title</h3>
+      </div>
+      <div class="panel-body">
+        Panel content
+      </div>
+    </div>
+  </div><!-- /.col-sm-4 -->
+</div>
+
+
+<div class="page-header">
+  <h1>Wells</h1>
+</div>
+<div class="well">
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.</p>
+</div>
+
+
+<div class="page-header">
+  <h1>Carousel</h1>
+</div>
+<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
+  <ol class="carousel-indicators">
+    <li data-target="#carousel-example-generic" data-slide-to="0" class=""></li>
+    <li data-target="#carousel-example-generic" data-slide-to="1" class=""></li>
+    <li data-target="#carousel-example-generic" data-slide-to="2" class="active"></li>
+  </ol>
+  <div class="carousel-inner" role="listbox">
+    <div class="item">
+      <img data-src="holder.js/1140x500/auto/#777:#555/text:First slide" alt="First slide [1140x500]" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTE0MCIgaGVpZ2h0PSI1MDAiIHZpZXdCb3g9IjAgMCAxMTQwIDUwMCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvMTE0MHg1MDAvYXV0by8jNzc3OiM1NTUvdGV4dDpGaXJzdCBzbGlkZQpDcmVhdGVkIHdpdGggSG9sZGVyLmpzIDIuNi4wLgpMZWFybiBtb3JlIGF0IGh0dHA6Ly9ob2xkZXJqcy5jb20KKGMpIDIwMTItMjAxNSBJdmFuIE1hbG9waW5za3kgLSBodHRwOi8vaW1za3kuY28KLS0+PGRlZnM+PHN0eWxlIHR5cGU9InRleHQvY3NzIj48IVtDREFUQVsjaG9sZGVyXzE1NjJjYTIxYzRkIHRleHQgeyBmaWxsOiM1NTU7Zm9udC13ZWlnaHQ6Ym9sZDtmb250LWZhbWlseTpBcmlhbCwgSGVsdmV0aWNhLCBPcGVuIFNhbnMsIHNhbnMtc2VyaWYsIG1vbm9zcGFjZTtmb250LXNpemU6NTdwdCB9IF1dPjwvc3R5bGU+PC9kZWZzPjxnIGlkPSJob2xkZXJfMTU2MmNhMjFjNGQiPjxyZWN0IHdpZHRoPSIxMTQwIiBoZWlnaHQ9IjUwMCIgZmlsbD0iIzc3NyIvPjxnPjx0ZXh0IHg9IjM5MC41MDc4MTI1IiB5PSIyNzUuNSI+Rmlyc3Qgc2xpZGU8L3RleHQ+PC9nPjwvZz48L3N2Zz4=" data-holder-rendered="true">
+    </div>
+    <div class="item active left">
+      <img data-src="holder.js/1140x500/auto/#666:#444/text:Second slide" alt="Second slide [1140x500]" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTE0MCIgaGVpZ2h0PSI1MDAiIHZpZXdCb3g9IjAgMCAxMTQwIDUwMCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvMTE0MHg1MDAvYXV0by8jNjY2OiM0NDQvdGV4dDpTZWNvbmQgc2xpZGUKQ3JlYXRlZCB3aXRoIEhvbGRlci5qcyAyLjYuMC4KTGVhcm4gbW9yZSBhdCBodHRwOi8vaG9sZGVyanMuY29tCihjKSAyMDEyLTIwMTUgSXZhbiBNYWxvcGluc2t5IC0gaHR0cDovL2ltc2t5LmNvCi0tPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbI2hvbGRlcl8xNTYyY2ExZTY3NCB0ZXh0IHsgZmlsbDojNDQ0O2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1mYW1pbHk6QXJpYWwsIEhlbHZldGljYSwgT3BlbiBTYW5zLCBzYW5zLXNlcmlmLCBtb25vc3BhY2U7Zm9udC1zaXplOjU3cHQgfSBdXT48L3N0eWxlPjwvZGVmcz48ZyBpZD0iaG9sZGVyXzE1NjJjYTFlNjc0Ij48cmVjdCB3aWR0aD0iMTE0MCIgaGVpZ2h0PSI1MDAiIGZpbGw9IiM2NjYiLz48Zz48dGV4dCB4PSIzMzUuNjAxNTYyNSIgeT0iMjc1LjUiPlNlY29uZCBzbGlkZTwvdGV4dD48L2c+PC9nPjwvc3ZnPg==" data-holder-rendered="true">
+    </div>
+    <div class="item next left">
+      <img data-src="holder.js/1140x500/auto/#555:#333/text:Third slide" alt="Third slide [1140x500]" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTE0MCIgaGVpZ2h0PSI1MDAiIHZpZXdCb3g9IjAgMCAxMTQwIDUwMCIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+PCEtLQpTb3VyY2UgVVJMOiBob2xkZXIuanMvMTE0MHg1MDAvYXV0by8jNTU1OiMzMzMvdGV4dDpUaGlyZCBzbGlkZQpDcmVhdGVkIHdpdGggSG9sZGVyLmpzIDIuNi4wLgpMZWFybiBtb3JlIGF0IGh0dHA6Ly9ob2xkZXJqcy5jb20KKGMpIDIwMTItMjAxNSBJdmFuIE1hbG9waW5za3kgLSBodHRwOi8vaW1za3kuY28KLS0+PGRlZnM+PHN0eWxlIHR5cGU9InRleHQvY3NzIj48IVtDREFUQVsjaG9sZGVyXzE1NjJjYTFiNTg5IHRleHQgeyBmaWxsOiMzMzM7Zm9udC13ZWlnaHQ6Ym9sZDtmb250LWZhbWlseTpBcmlhbCwgSGVsdmV0aWNhLCBPcGVuIFNhbnMsIHNhbnMtc2VyaWYsIG1vbm9zcGFjZTtmb250LXNpemU6NTdwdCB9IF1dPjwvc3R5bGU+PC9kZWZzPjxnIGlkPSJob2xkZXJfMTU2MmNhMWI1ODkiPjxyZWN0IHdpZHRoPSIxMTQwIiBoZWlnaHQ9IjUwMCIgZmlsbD0iIzU1NSIvPjxnPjx0ZXh0IHg9IjM3Ny44NjcxODc1IiB5PSIyNzUuNSI+VGhpcmQgc2xpZGU8L3RleHQ+PC9nPjwvZz48L3N2Zz4=" data-holder-rendered="true">
+    </div>
+  </div>
+  <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
+    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+    <span class="sr-only">Previous</span>
+  </a>
+  <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
+    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+    <span class="sr-only">Next</span>
+  </a>
+</div>
+
+
+</div> <!-- /container -->

benchmarks/bootstrap-compile-bp/bp.conf.js

@@ -0,0 +1,15 @@
+/* eslint-env node */
+
+'use strict';
+
+module.exports = function(config) {
+  config.set({
+    scripts: [{
+      id: 'angular',
+      src: '/build/angular.js'
+    },
+    {
+      src: 'app.js'
+    }]
+  });
+};

benchmarks/bootstrap-compile-bp/main.html

@@ -0,0 +1,40 @@
+<div ng-app="boostrapCompileBenchmark" ng-cloak>
+  <div ng-controller="DataController as config">
+    <p>Please, select which configuration you want to use:</p>
+    <ul>
+      <li>
+        <a href="?comment=disabled&css=disabled">Only EA</a>
+        <span ng-show="config.isEA">(active)</span>
+      </li>
+      <li>
+        <a href="?comment=disabled">Active EA and classes directives</a>
+        <span ng-show="config.isEAC">(active)</span>
+      </li>
+      <li>
+        <a href="?css=disabled">Active EA and comment directives</a>
+        <span ng-show="config.isEAM">(active)</span>
+      </li>
+      <li>
+        <a href="?">Active all directives</a>
+        <span ng-show="config.isEACM">(active)</span>
+      </li>
+    </ul>
+
+    <hr>
+    <p>How many repetitions do you want to do?</p>
+    <input type="number" ng-model="config.repeats">
+
+    <hr>
+    <p>Template to $compile:</p>
+    <select
+      ng-options="template for template in config.templates"
+      ng-model="config.selectedTemplate"
+      ng-change="config.loadTemplate()"></select>
+
+    <p>The benchmark is
+      <span ng-show="config.html">Ready!</span>
+      <span ng-hide="config.html">LOADING!</span>
+    </p>
+
+  </div>
+</div>

benchmarks/event-delegation-bp/app.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var app = angular.module('eventDelegationBenchmark', []);
 
 app.directive('noopDir', function() {
@@ -5,7 +7,7 @@ app.directive('noopDir', function() {
     compile: function($element, $attrs) {
       return function($scope, $element) {
         return 1;
-      }
+      };
     }
   };
 });
@@ -13,12 +15,12 @@ app.directive('noopDir', function() {
 app.directive('nativeClick', ['$parse', function($parse) {
   return {
     compile: function($element, $attrs) {
-      var expr = $parse($attrs.tstEvent);
+      $parse($attrs.tstEvent);
       return function($scope, $element) {
         $element[0].addEventListener('click', function() {
           console.log('clicked');
         }, false);
-      }
+      };
     }
   };
 }]);
@@ -26,13 +28,12 @@ app.directive('nativeClick', ['$parse', function($parse) {
 app.directive('dlgtClick', function() {
   return {
     compile: function($element, $attrs) {
-      var evt = $attrs.dlgtClick;
       // We don't setup the global event listeners as the costs are small and one time only...
     }
   };
 });
 
-app.controller('DataController', function($rootScope) {
+app.controller('DataController', function DataController($rootScope) {
   this.ngRepeatCount = 1000;
   this.rows = [];
   var self = this;
@@ -47,8 +48,8 @@ app.controller('DataController', function($rootScope) {
       self.rows = oldRows;
       if (self.rows.length !== self.ngRepeatCount) {
         self.rows = [];
-        for (var i=0; i<self.ngRepeatCount; i++) {
-          self.rows.push('row'+i);
+        for (var i = 0; i < self.ngRepeatCount; i++) {
+          self.rows.push('row' + i);
         }
       }
       $rootScope.$apply();

benchmarks/event-delegation-bp/bp.conf.js

@@ -1,10 +1,14 @@
+/* eslint-env node */
+
+'use strict';
+
 module.exports = function(config) {
   config.set({
     scripts: [{
       id: 'angular',
       src: '/build/angular.js'
-    },{
-      src: 'app.js',
+    }, {
+      src: 'app.js'
     }]
   });
 };

benchmarks/largetable-bp/app.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var app = angular.module('largetableBenchmark', []);
 
 app.config(function($compileProvider) {
@@ -12,21 +14,23 @@ app.filter('noop', function() {
   };
 });
 
-app.controller('DataController', function($scope, $rootScope) {
+app.controller('DataController', function DataController($scope, $rootScope) {
   var totalRows = 1000;
   var totalColumns = 20;
 
   var data = $scope.data = [];
   $scope.digestDuration = '?';
-  $scope.numberOfBindings = totalRows*totalColumns*2 + totalRows + 1;
+  $scope.numberOfBindings = totalRows * totalColumns * 2 + totalRows + 1;
   $scope.numberOfWatches = '?';
 
+  /** @this */
   function iGetter() { return this.i; }
+  /** @this */
   function jGetter() { return this.j; }
 
-  for (var i=0; i<totalRows; i++) {
+  for (var i = 0; i < totalRows; i++) {
     data[i] = [];
-    for (var j=0; j<totalColumns; j++) {
+    for (var j = 0; j < totalColumns; j++) {
       data[i][j] = {
         i: i, j: j,
         iFn: iGetter,
@@ -64,14 +68,13 @@ app.controller('DataController', function($scope, $rootScope) {
   });
 });
 
-var fn = function() { return 'x'};
-
 
 app.directive('baselineBindingTable', function() {
   return {
     restrict: 'E',
-    link: function ($scope, $element) {
+    link: function($scope, $element) {
       var i, j, row, cell, comment;
+      var document = window.document;
       var template = document.createElement('span');
       template.setAttribute('ng-repeat', 'foo in foos');
       template.classList.add('ng-scope');
@@ -104,8 +107,9 @@ app.directive('baselineBindingTable', function() {
 app.directive('baselineInterpolationTable', function() {
   return {
     restrict: 'E',
-    link: function ($scope, $element) {
+    link: function($scope, $element) {
       var i, j, row, cell, comment;
+      var document = window.document;
       var template = document.createElement('span');
       template.setAttribute('ng-repeat', 'foo in foos');
       template.classList.add('ng-scope');
@@ -180,4 +184,4 @@ app.directive('baselineTable', function() {
   };
 });
 
- */
+ */

benchmarks/largetable-bp/bp.conf.js

@@ -1,3 +1,7 @@
+/* eslint-env node */
+
+'use strict';
+
 module.exports = function(config) {
   config.set({
     scripts: [{
@@ -9,7 +13,7 @@ module.exports = function(config) {
       src: '/build/angular.js'
     },
     {
-      src: 'app.js',
+      src: 'app.js'
     }]
   });
 };

benchmarks/largetable-bp/jquery-noop.js

@@ -1 +1 @@
-//Override me with ?jquery=/bower_components/jquery/dist/jquery.js
+// Override me with ?jquery=/bower_components/jquery/dist/jquery.js

benchmarks/ng-options-bp/app.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 /* globals angular, benchmarkSteps */
 

benchmarks/ng-options-bp/bp.conf.js

@@ -1,11 +1,15 @@
+/* eslint-env node */
+
+'use strict';
+
 module.exports = function(config) {
   config.set({
-    scripts: [    {
+    scripts: [{
       id: 'angular',
       src: '/build/angular.js'
     },
     {
-      src: 'app.js',
+      src: 'app.js'
     }]
   });
 };

benchmarks/orderby-bp/app.js

@@ -1,6 +1,8 @@
+'use strict';
+
 var app = angular.module('orderByBenchmark', []);
 
-app.controller('DataController', function($rootScope, $scope) {
+app.controller('DataController', function DataController($rootScope, $scope) {
   this.ngRepeatCount = 5000;
   this.rows = [];
   var self = this;
@@ -37,7 +39,7 @@ app.controller('DataController', function($rootScope, $scope) {
         }
       }
     }
-  })
+  });
 
   benchmarkSteps.push({
     name: '$apply',

benchmarks/orderby-bp/bp.conf.js

@@ -1,14 +1,18 @@
+/* eslint-env node */
+
+'use strict';
+
 module.exports = function(config) {
   config.set({
     scripts: [
     {
-      "id": "jquery",
-      "src": "jquery-noop.js"
-    },{
+      'id': 'jquery',
+      'src': 'jquery-noop.js'
+    }, {
       id: 'angular',
       src: '/build/angular.js'
-    },{
-      src: 'app.js',
+    }, {
+      src: 'app.js'
     }]
   });
 };

benchmarks/parsed-expressions-bp/app.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var app = angular.module('parsedExpressionBenchmark', []);
 
 app.config(function($compileProvider) {
@@ -17,11 +19,10 @@ app.directive('bmPeWatch', function() {
   return {
     restrict: 'A',
     compile: function($element, $attrs) {
-      $element.text( $attrs.bmPeWatch );
+      $element.text($attrs.bmPeWatch);
       return function($scope, $element, $attrs) {
         $scope.$watch($attrs.bmPeWatch, function(val) {
           $element.text(val);
-
         });
       };
     }
@@ -38,9 +39,9 @@ app.directive('bmPeWatchLiteral', function($parse) {
   return {
     restrict: 'A',
     compile: function($element, $attrs) {
-      $element.text( $attrs.bmPeWatchLiteral );
+      $element.text($attrs.bmPeWatchLiteral);
       return function($scope, $element, $attrs) {
-        $scope.$watch( $parse($attrs.bmPeWatchLiteral, retZero) );
+        $scope.$watch($parse($attrs.bmPeWatchLiteral, retZero));
       };
     }
   };
@@ -53,33 +54,33 @@ app.controller('DataController', function($scope, $rootScope) {
 
   var star = '*';
 
-  $scope.func = function() { return star;};
+  $scope.func = function() { return star; };
 
-  for (var i=0; i<totalRows; i++) {
+  for (var i = 0; i < totalRows; i++) {
     data.push({
       index: i,
-      odd:   i%2 === 0,
-      even:  i%2 === 1,
-      str0: "foo-" + Math.random()*Date.now(),
-      str1: "bar-" + Math.random()*Date.now(),
-      str2: "baz-" + Math.random()*Date.now(),
-      num0:  Math.random()*Date.now(),
-      num1:  Math.random()*Date.now(),
-      num2:  Math.random()*Date.now(),
-      date0: new Date(Math.random()*Date.now()),
-      date1: new Date(Math.random()*Date.now()),
-      date2: new Date(Math.random()*Date.now()),
-      func: function(){ return star; },
-      obj: data[i-1],
-      keys: data[i-1] && (data[i-1].keys || Object.keys(data[i-1])),
-      constructor: data[i-1]
+      odd: i % 2 === 0,
+      even: i % 2 === 1,
+      str0: 'foo-' + Math.random() * Date.now(),
+      str1: 'bar-' + Math.random() * Date.now(),
+      str2: 'baz-' + Math.random() * Date.now(),
+      num0: Math.random() * Date.now(),
+      num1: Math.random() * Date.now(),
+      num2: Math.random() * Date.now(),
+      date0: new Date(Math.random() * Date.now()),
+      date1: new Date(Math.random() * Date.now()),
+      date2: new Date(Math.random() * Date.now()),
+      func: function() { return star; },
+      obj: data[i - 1],
+      keys: data[i - 1] && (data[i - 1].keys || Object.keys(data[i - 1])),
+      constructor: data[i - 1]
     });
   }
 
   benchmarkSteps.push({
     name: '$apply',
     fn: function() {
-      for (var i=0; i<50; i++) {
+      for (var i = 0; i < 50; i++) {
         $rootScope.$digest();
       }
     }

benchmarks/parsed-expressions-bp/bp.conf.js

@@ -1,11 +1,15 @@
+/* eslint-env node */
+
+'use strict';
+
 module.exports = function(config) {
   config.set({
-    scripts: [    {
+    scripts: [{
       id: 'angular',
       src: '/build/angular.js'
     },
     {
-      src: 'app.js',
+      src: 'app.js'
     }]
   });
 };

benchmarks/parsed-expressions-bp/main.html

@@ -52,6 +52,11 @@
           <label for="functionCalls">Function calls</label>
         </li>
 
+        <li>
+          <input type="radio" ng-model="expressionType" value="assignment" id="assignment">
+          <label for="assignment">Assignment</label>
+        </li>
+
         <li>
           <input type="radio" ng-model="expressionType" value="objectLiterals" id="objectLiterals">
           <label for="objectLiterals">Object Literals</label>
@@ -197,6 +202,18 @@
           <span bm-pe-watch="row.func(row.func(), row.func())"></span>
         </li>
 
+        <li ng-switch-when="assignment" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="row.foo = row.str0"></span>
+          <span bm-pe-watch="row.obj.foo = row.str1"></span>
+          <span bm-pe-watch="row.obj.obj.foo = row.str2"></span>
+          <span bm-pe-watch="row['bar'] = row.num0"></span>
+          <span bm-pe-watch="row.obj['bar'] = row.num1"></span>
+          <span bm-pe-watch="row.obj.obj['bar'] = row.num2"></span>
+          <span bm-pe-watch="row[0] = row.date0"></span>
+          <span bm-pe-watch="row.obj[0] = row.date1"></span>
+          <span bm-pe-watch="row.obj.obj[0] = row.date2"></span>
+        </li>
+
         <li ng-switch-when="objectLiterals" ng-repeat="(rowIdx, row) in ::data">
           <span bm-pe-watch-literal="{foo: rowIdx}"></span>
           <span bm-pe-watch-literal="{foo: row, bar: rowIdx}"></span>

bower.json

@@ -1,8 +1,10 @@
 {
-  "name": "AngularJS",
+  "name": "angularjs",
   "license": "MIT",
   "devDependencies": {
-    "jquery": "2.1.1",
+    "jquery": "3.1.0",
+    "jquery-2.2": "jquery#2.2.4",
+    "jquery-2.1": "jquery#2.1.4",
     "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
     "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
   }

changelog.js

@@ -38,7 +38,7 @@ var parseRawCommit = function(raw) {
 
   lines.forEach(function(line) {
     match = line.match(/(?:Closes|Fixes)\s#(\d+)/);
-    if (match) msg.closes.push(parseInt(match[1]));
+    if (match) msg.closes.push(parseInt(match[1], 10));
   });
 
   match = raw.match(/BREAKING CHANGE:([\s\S]*)/);
@@ -48,7 +48,7 @@ var parseRawCommit = function(raw) {
 
 
   msg.body = lines.join('\n');
-  match = msg.subject.match(/^(.*)\((.*)\)\:\s(.*)$/);
+  match = msg.subject.match(/^(.*)\((.*)\):\s(.*)$/);
 
   if (!match || !match[1] || !match[3]) {
     warn('Incorrect message: %s %s', msg.hash, msg.subject);
@@ -148,8 +148,6 @@ var writeChangelog = function(stream, commits, version) {
     breaks: {}
   };
 
-  sections.breaks[EMPTY_COMPONENT] = [];
-
   commits.forEach(function(commit) {
     var section = sections[commit.type];
     var component = commit.component || EMPTY_COMPONENT;
@@ -162,7 +160,7 @@ var writeChangelog = function(stream, commits, version) {
     if (commit.breaking) {
       sections.breaks[component] = sections.breaks[component] || [];
       sections.breaks[component].push({
-        subject: util.format("due to %s,\n %s", linkToCommit(commit.hash), commit.breaking),
+        subject: util.format('due to %s,\n %s', linkToCommit(commit.hash), commit.breaking),
         hash: commit.hash,
         closes: []
       });

changelog.spec.js

@@ -67,7 +67,7 @@ describe('changelog.js', function() {
         module2: [{subject: 'breaking change 2'}]
       };
       var expectedOutput =
-          '\n' + '## test\n\n' +
+          '\n## test\n\n' +
           '- **module1:** breaking change 1\n' +
           '- **module2:** breaking change 2\n' +
           '\n';
@@ -92,7 +92,7 @@ describe('changelog.js', function() {
         ]
       };
       var expectedOutput =
-          '\n' + '## test\n\n' +
+          '\n## test\n\n' +
           '- **module1:**\n' +
           '  - breaking change 1.1\n' +
           '  - breaking change 1.2\n' +

compare-master-to-stable.js

@@ -9,72 +9,72 @@ var Q = require('q');
 var _ = require('lodash');
 var semver = require('semver');
 
-var exec = function (cmd) {
-  return function () {
+var exec = function(cmd) {
+  return function() {
     var args = Array.prototype.slice.call(arguments, 0);
     args.unshift(cmd);
     var fullCmd = util.format.apply(util, args);
-    return Q.nfcall(cp.exec, fullCmd).then(function (out) {
+    return Q.nfcall(cp.exec, fullCmd).then(function(out) {
       return out[0].split('\n');
     });
   };
 };
 
-var andThen = function (fn, after) {
-  return function () {
+var andThen = function(fn, after) {
+  return /** @this */ function() {
     return fn.apply(this, arguments).then(after);
   };
 };
 
-var oneArg = function (fn) {
-  return function (arg) {
+var oneArg = function(fn) {
+  return function(arg) {
     return fn(arg);
   };
 };
 
-var oneLine = function (lines) {
+var oneLine = function(lines) {
   return lines[0].trim();
 };
 
-var noArgs = function (fn) {
-  return function () {
+var noArgs = function(fn) {
+  return function() {
     return fn();
   };
 };
 
-var identity = function (i) { return i; };
+var identity = function(i) { return i; };
 
 // like Q.all, but runs the commands in series
 // useful for ensuring env state (like which branch is checked out)
-var allInSeries = function (fn) {
-  return function (args) {
+var allInSeries = function(fn) {
+  return function(args) {
     var results = [];
     var def;
     while (args.length > 0) {
-      (function (arg) {
+      (function(arg) {
         if (def) {
-          def = def.then(function () {
+          def = def.then(function() {
             return fn(arg);
           });
         } else {
           def = fn(arg);
         }
-        def = def.then(function (res) {
+        def = def.then(function(res) {
           results.push(res);
         });
-      }(args.pop()));
+      })(args.pop());
     }
-    return def.then(function () {
+    return def.then(function() {
       return results;
     });
   };
 };
 
-var compareBranches = function (left, right) {
+var compareBranches = function(left, right) {
   console.log('# These commits are in ' + left.name + ' but not in ' + right.name + '\n');
   console.log(_(left.log).
     difference(right.log).
-    map(function (line) {
+    map(function(line) {
       return left.full[left.log.indexOf(line)]; // lol O(n^2)
     }).
     value().
@@ -85,44 +85,43 @@ var checkout = oneArg(exec('git checkout %s'));
 
 var getCurrentBranch = andThen(noArgs(exec('git rev-parse --abbrev-ref HEAD')), oneLine);
 var getTags = noArgs(exec('git tag'));
-var getShaOfTag = oneArg(exec('git rev-list %s | head -n 1'));
 var getTheLog = oneArg(exec('git log --pretty=oneline %s..HEAD | cat'));
 
 // remember this so we can restore state
 var currentBranch;
 
 getCurrentBranch().
-then(function (branch) {
+then(function(branch) {
   currentBranch = branch;
 }).
 then(getTags).
-then(function (tags) {
+then(function(tags) {
   return tags.
     filter(semver.valid).
     map(semver.clean).
     sort(semver.rcompare);
 }).
-then(function (tags) {
-  var major = tags[0].split('.')[0];
+then(function(tags) {
+  var major = semver(tags[0]).major;
   return tags.
-    filter(function (ver) {
-      return semver(ver).major == major;
+    filter(function(ver) {
+      return semver(ver).major === major;
     });
 }).
-then(function (tags) {
+then(function(tags) {
   return _(tags).
-    groupBy(function (tag) {
+    groupBy(function(tag) {
       return tag.split('.')[1];
     }).
-    map(function (group) {
+    map(function(group) {
       return _.first(group);
     }).
-    map(function (tag) {
+    map(function(tag) {
       return 'v' + tag;
     }).
     value();
 }).
-then(function (tags) {
+then(function(tags) {
   var master = tags.pop();
   var stable = tags.pop();
 
@@ -131,38 +130,38 @@ then(function (tags) {
     { name: 'master', tag: master}
   ];
 }).
-then(allInSeries(function (branch) {
+then(allInSeries(function(branch) {
   return checkout(branch.name).
-    then(function () {
+    then(function() {
       return getTheLog(branch.tag);
     }).
-    then(function (log) {
+    then(function(log) {
       return log.
         filter(identity);
     }).
-    then(function (log) {
-      branch.full = log.map(function (line) {
+    then(function(log) {
+      branch.full = log.map(function(line) {
         line = line.split(' ');
         var sha = line.shift();
         var msg = line.join(' ');
         return sha + ((/fix\([^\)]+\):/i.test(msg))  ? ' * ' : '   ') + msg;
       });
-      branch.log = log.map(function (line) {
+      branch.log = log.map(function(line) {
         return line.substr(41);
       });
       return branch;
     });
 })).
-then(function (pairs) {
+then(function(pairs) {
   compareBranches(pairs[0], pairs[1]);
   console.log('\n');
   compareBranches(pairs[1], pairs[0]);
   return pairs;
 }).
-then(function () {
+then(function() {
   return checkout(currentBranch);
 }).
-catch(function (e) {
+catch(function(e) {
   console.log(e.stack);
 });
 

docs/app/assets/css/docs.css

@@ -647,6 +647,11 @@ ul.events > li {
   padding-top: 50px;
 }
 
+.diagram {
+  margin-bottom: 10px;
+  margin-top: 30px;
+}
+
 @media only screen and (min-width: 769px) and (max-width: 991px) {
   .main-body-grid {
     margin-top: 160px;

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

@@ -1,17 +1,18 @@
-"use strict";
-/* jshint browser: true */
-/* global importScripts, onmessage: true, postMessage, lunr */
+'use strict';
+
+/* eslint-env worker */
+/* global importScripts, lunr */
 
 // Load up the lunr library
 importScripts('../components/lunr.js-0.5.12/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
-var index = lunr(function() {
+var index = lunr(/** @this */function() {
   this.ref('path');
   this.field('titleWords', {boost: 50});
-  this.field('members', { boost: 40});
-  this.field('keywords', { boost : 20 });
+  this.field('members', {boost: 40});
+  this.field('keywords', {boost: 20});
 });
 
 // Retrieve the searchData which contains the information about each page to be indexed
@@ -25,13 +26,13 @@ searchDataRequest.onload = function() {
   searchData.forEach(function(page) {
     index.add(page);
   });
-  postMessage({ e: 'index-ready' });
+  self.postMessage({e: 'index-ready'});
 };
 searchDataRequest.open('GET', 'search-data.json');
 searchDataRequest.send();
 
 // The worker receives a message everytime the web app wants to query the index
-onmessage = function(oEvent) {
+self.onmessage = function(oEvent) {
   var q = oEvent.data.q;
   var hits = index.search(q);
   var results = [];
@@ -40,5 +41,5 @@ onmessage = function(oEvent) {
     results.push(hit.ref);
   });
   // The results of the query are sent back to the web app via a new message
-  postMessage({ e: 'query-ready', q: q, d: results });
-};
+  self.postMessage({e: 'query-ready', q: q, d: results});
+};

docs/app/e2e/.eslintrc.json

@@ -0,0 +1,28 @@
+{
+  "root": true,
+  "extends": "../../../.eslintrc-node.json",
+
+
+  "env": {
+    "jasmine": true,
+    "protractor": true
+  },
+
+  "globals": {
+    /* testabilityPatch / matchers */
+    "inject": false,
+    "module": false,
+    "dealoc": false,
+    "_jQuery": false,
+    "_jqLiteMode": false,
+    "sortedHtml": false,
+    "childrenTagsOf": false,
+    "assertHidden": false,
+    "assertVisible": false,
+    "provideLog": false,
+    "spyOnlyCallsWithArgs": false,
+    "createMockStyleSheet": false,
+    "browserTrigger": false,
+    "jqLiteCacheSize": false
+  }
+}

docs/app/e2e/.jshintrc

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

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

@@ -1,10 +1,10 @@
 'use strict';
 
-describe("doc.angularjs.org", function() {
+describe('doc.angularjs.org', function() {
 
-  describe("API pages", function() {
+  describe('API pages', function() {
 
-    it("should display links to code on GitHub", function() {
+    it('should display links to code on GitHub', function() {
       browser.get('build/docs/index.html#!/api/ng/service/$http');
       expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
 
@@ -12,7 +12,7 @@ describe("doc.angularjs.org", function() {
       expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
     });
 
-    it('should change the page content when clicking a link to a service', function () {
+    it('should change the page content when clicking a link to a service', function() {
       browser.get('build/docs/index.html');
 
       var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
@@ -23,7 +23,7 @@ describe("doc.angularjs.org", function() {
     });
 
 
-    it('should show the functioning input directive example', function () {
+    it('should show the functioning input directive example', function() {
       browser.get('build/docs/index.html#!/api/ng/directive/input');
 
       // Ensure that the page is loaded before trying to switch frames.
@@ -38,7 +38,7 @@ describe("doc.angularjs.org", function() {
       expect(code.getText()).toContain('guest!!!');
     });
 
-    it("should trim indentation from code blocks", function() {
+    it('should trim indentation from code blocks', function() {
       browser.get('build/docs/index.html#!/api/ng/type/$rootScope.Scope');
 
       var codeBlocks = element.all(by.css('pre > code.lang-js'));
@@ -48,4 +48,4 @@ describe("doc.angularjs.org", function() {
       });
     });
   });
-});
+});

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

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

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

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

docs/app/e2e/app.scenario.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var webdriver = require('protractor/node_modules/selenium-webdriver');
+var webdriver = require('selenium-webdriver');
 
-describe('docs.angularjs.org', function () {
+describe('docs.angularjs.org', function() {
 
   beforeEach(function() {
     // read and clear logs from previous tests
@@ -24,7 +24,7 @@ describe('docs.angularjs.org', function () {
   });
 
 
-  describe('App', function () {
+  describe('App', function() {
     // it('should filter the module list when searching', function () {
     //   browser.get();
     //   browser.waitForAngular();
@@ -38,8 +38,8 @@ describe('docs.angularjs.org', function () {
     // });
 
 
-    it('should change the page content when clicking a link to a service', function () {
-      browser.get('build/docs/index.html');
+    it('should change the page content when clicking a link to a service', function() {
+      browser.get('build/docs/index-production.html');
 
       var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
       ngBindLink.click();
@@ -51,36 +51,36 @@ describe('docs.angularjs.org', function () {
 
 
     it('should be resilient to trailing slashes', function() {
-      browser.get('build/docs/index.html#!/api/ng/function/angular.noop/');
+      browser.get('build/docs/index-production.html#!/api/ng/function/angular.noop/');
       var pageBody = element(by.css('h1'));
       expect(pageBody.getText()).toEqual('angular.noop');
     });
 
 
     it('should be resilient to trailing "index"', function() {
-      browser.get('build/docs/index.html#!/api/ng/function/angular.noop/index');
+      browser.get('build/docs/index-production.html#!/api/ng/function/angular.noop/index');
       var pageBody = element(by.css('h1'));
       expect(pageBody.getText()).toEqual('angular.noop');
     });
 
 
     it('should be resilient to trailing "index/"', function() {
-      browser.get('build/docs/index.html#!/api/ng/function/angular.noop/index/');
+      browser.get('build/docs/index-production.html#!/api/ng/function/angular.noop/index/');
       var pageBody = element(by.css('h1'));
       expect(pageBody.getText()).toEqual('angular.noop');
     });
 
 
     it('should display formatted error messages on error doc pages', function() {
-      browser.get('build/docs/index.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
-      expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
+      browser.get('build/docs/index-production.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
+      expect(element(by.css('.minerr-errmsg')).getText()).toEqual('Argument \'Missing\' is not a function, got undefined');
     });
 
-    it("should display an error if the page does not exist", function() {
-      browser.get('build/docs/index.html#!/api/does/not/exist');
+    it('should display an error if the page does not exist', function() {
+      browser.get('build/docs/index-production.html#!/api/does/not/exist');
       expect(element(by.css('h1')).getText()).toBe('Oops!');
     });
 
   });
 
-});
+});

docs/app/src/.eslintrc.json

@@ -0,0 +1,8 @@
+{
+  "root": true,
+  "extends": "../../../.eslintrc-browser.json",
+
+  "globals": {
+    "lunr": false
+  }
+}

docs/app/src/app.js

@@ -1,3 +1,5 @@
+'use strict';
+
 angular.module('docsApp', [
   'ngRoute',
   'ngCookies',

docs/app/src/directives.js

@@ -1,3 +1,5 @@
+'use strict';
+
 angular.module('directives', [])
 
 /**

docs/app/src/docs.js

@@ -1,3 +1,5 @@
+'use strict';
+
 angular.module('DocsController', [])
 
 .controller('DocsController', [
@@ -27,9 +29,9 @@ angular.module('DocsController', [])
 
     path = path.replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
 
-    currentPage = $scope.currentPage = NG_PAGES[path];
+    var currentPage = $scope.currentPage = NG_PAGES[path];
 
-    if ( currentPage ) {
+    if (currentPage) {
       $scope.partialPath = 'partials/' + path + '.html';
       $scope.currentArea = NG_NAVIGATION[currentPage.area];
       var pathParts = currentPage.path.split('/');
@@ -37,7 +39,7 @@ angular.module('DocsController', [])
       var breadcrumbPath = '';
       angular.forEach(pathParts, function(part) {
         breadcrumbPath += part;
-        breadcrumb.push({ name: (NG_PAGES[breadcrumbPath]&&NG_PAGES[breadcrumbPath].name) || part, url: breadcrumbPath });
+        breadcrumb.push({ name: (NG_PAGES[breadcrumbPath] && NG_PAGES[breadcrumbPath].name) || part, url: breadcrumbPath });
         breadcrumbPath += '/';
       });
     } else {
@@ -52,7 +54,7 @@ angular.module('DocsController', [])
    ***********************************/
 
   $scope.versionNumber = angular.version.full;
-  $scope.version = angular.version.full + "  " + angular.version.codeName;
+  $scope.version = angular.version.full + '  ' + angular.version.codeName;
   $scope.loading = 0;
 
 

docs/app/src/errors.js

@@ -1,23 +1,25 @@
+'use strict';
+
 angular.module('errors', ['ngSanitize'])
 
-.filter('errorLink', ['$sanitize', function ($sanitize) {
-  var LINKY_URL_REGEXP = /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s\.\;\,\(\)\{\}<>]/g,
+.filter('errorLink', ['$sanitize', function($sanitize) {
+  var LINKY_URL_REGEXP = /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s\.;,\(\)\{\}<>]/g,
       MAILTO_REGEXP = /^mailto:/,
       STACK_TRACE_REGEXP = /:\d+:\d+$/;
 
-  var truncate = function (text, nchars) {
+  var truncate = function(text, nchars) {
     if (text.length > nchars) {
       return text.substr(0, nchars - 3) + '...';
     }
     return text;
   };
 
-  return function (text, target) {
+  return function(text, target) {
     if (!text) return text;
 
     var targetHtml = target ? ' target="' + target + '"' : '';
 
-    return $sanitize(text.replace(LINKY_URL_REGEXP, function (url) {
+    return $sanitize(text.replace(LINKY_URL_REGEXP, function(url) {
       if (STACK_TRACE_REGEXP.test(url)) {
         return url;
       }
@@ -25,7 +27,7 @@ angular.module('errors', ['ngSanitize'])
       // if we did not match ftp/http/mailto then assume mailto
       if (!/^((ftp|https?):\/\/|mailto:)/.test(url)) url = 'mailto:' + url;
 
-      return '<a' + targetHtml + ' href="' + url +'">' +
+      return '<a' + targetHtml + ' href="' + url + '">' +
                 truncate(url.replace(MAILTO_REGEXP, ''), 60) +
               '</a>';
     }));
@@ -33,33 +35,33 @@ angular.module('errors', ['ngSanitize'])
 }])
 
 
-.directive('errorDisplay', ['$location', 'errorLinkFilter', function ($location, errorLinkFilter) {
-  var encodeAngleBrackets = function (text) {
+.directive('errorDisplay', ['$location', 'errorLinkFilter', function($location, errorLinkFilter) {
+  var encodeAngleBrackets = function(text) {
     return text.replace(/</g, '&lt;').replace(/>/g, '&gt;');
   };
 
-  var interpolate = function (formatString) {
+  var interpolate = function(formatString) {
     var formatArgs = arguments;
-    return formatString.replace(/\{\d+\}/g, function (match) {
+    return formatString.replace(/\{\d+\}/g, function(match) {
       // Drop the braces and use the unary plus to convert to an integer.
       // The index will be off by one because of the formatString.
       var index = +match.slice(1, -1);
       if (index + 1 >= formatArgs.length) {
         return match;
       }
-      return formatArgs[index+1];
+      return formatArgs[index + 1];
     });
   };
 
   return {
-    link: function (scope, element, attrs) {
+    link: function(scope, element, attrs) {
       var search = $location.search(),
         formatArgs = [attrs.errorDisplay],
         formattedText,
         i;
 
-      for (i = 0; angular.isDefined(search['p'+i]); i++) {
-        formatArgs.push(search['p'+i]);
+      for (i = 0; angular.isDefined(search['p' + i]); i++) {
+        formatArgs.push(search['p' + i]);
       }
 
       formattedText = encodeAngleBrackets(interpolate.apply(null, formatArgs));

docs/app/src/examples.js

@@ -1,8 +1,9 @@
+'use strict';
+
 angular.module('examples', [])
 
-.directive('runnableExample', ['$templateCache', '$document', function($templateCache, $document) {
+.directive('runnableExample', [function() {
   var exampleClassNameSelector = '.runnable-example-file';
-  var doc = $document[0];
   var tpl =
     '<nav class="runnable-example-tabs" ng-if="tabs">' +
     '  <a ng-class="{active:$index==activeTabIndex}"' +
@@ -29,12 +30,12 @@ angular.module('examples', [])
       return function(scope, element) {
         var node = element[0];
         var examples = node.querySelectorAll(exampleClassNameSelector);
-        var tabs = [], now = Date.now();
+        var tabs = [];
         angular.forEach(examples, function(child, index) {
           tabs.push(child.getAttribute('name'));
         });
 
-        if(tabs.length > 0) {
+        if (tabs.length > 0) {
           scope.tabs = tabs;
           scope.$on('tabChange', function(e, index, title) {
             angular.forEach(examples, function(child) {
@@ -101,7 +102,7 @@ angular.module('examples', [])
     },
     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() {
+    controller: [function PlnkrOpenerCtrl() {
       var ctrl = this;
 
       ctrl.example = {
@@ -137,8 +138,8 @@ angular.module('examples', [])
         var newWindow = clickEvent.ctrlKey || clickEvent.metaKey;
 
         var postData = {
-          'tags[0]': "angularjs",
-          'tags[1]': "example",
+          'tags[0]': 'angularjs',
+          'tags[1]': 'example',
           'private': true
         };
 
@@ -153,7 +154,7 @@ angular.module('examples', [])
 
             postData.description = ctrl.example.name;
 
-            formPostData('http://plnkr.co/edit/?p=preview', newWindow, postData);
+            formPostData('https://plnkr.co/edit/?p=preview', newWindow, postData);
           });
 
       };
@@ -167,7 +168,7 @@ angular.module('examples', [])
 }])
 
 .factory('getExampleData', ['$http', '$q', function($http, $q) {
-  return function(exampleFolder){
+  return function(exampleFolder) {
     // Load the manifest for the example
     return $http.get(exampleFolder + '/manifest.json')
       .then(function(response) {
@@ -182,8 +183,8 @@ 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";
+              if (filename === 'index-production.html') {
+                filename = 'index.html';
               }
 
               return {
@@ -199,4 +200,4 @@ angular.module('examples', [])
         });
       });
   };
-}]);
+}]);

docs/app/src/search.js

@@ -1,3 +1,5 @@
+'use strict';
+
 angular.module('search', [])
 
 .controller('DocsSearchCtrl', ['$scope', '$location', 'docsSearch', function($scope, $location, docsSearch) {
@@ -9,7 +11,7 @@ angular.module('search', [])
 
   $scope.search = function(q) {
     var MIN_SEARCH_LENGTH = 2;
-    if(q.length >= MIN_SEARCH_LENGTH) {
+    if (q.length >= MIN_SEARCH_LENGTH) {
       docsSearch(q).then(function(hits) {
         // Make sure the areas are always in the same order
         var results = {
@@ -23,28 +25,24 @@ angular.module('search', [])
         angular.forEach(hits, function(hit) {
           var area = hit.area;
 
-          var limit = (area == 'api') ? 40 : 14;
+          var limit = (area === 'api') ? 40 : 14;
           results[area] = results[area] || [];
-          if(results[area].length < limit) {
+          if (results[area].length < limit) {
             results[area].push(hit);
           }
         });
 
-        var totalAreas = 0;
-        for(var i in results) {
-          ++totalAreas;
-        }
-        if(totalAreas > 0) {
+        var totalAreas = Object.keys(results).length;
+        if (totalAreas > 0) {
           $scope.colClassName = 'cols-' + totalAreas;
         }
         $scope.hasResults = totalAreas > 0;
         $scope.results = results;
       });
-    }
-    else {
+    } else {
       clearResults();
     }
-    if(!$scope.$$phase) $scope.$apply();
+    if (!$scope.$$phase) $scope.$apply();
   };
 
   $scope.submit = function() {
@@ -52,14 +50,14 @@ angular.module('search', [])
     if ($scope.results.api) {
       result = $scope.results.api[0];
     } else {
-      for(var i in $scope.results) {
+      for (var i in $scope.results) {
         result = $scope.results[i][0];
-        if(result) {
+        if (result) {
           break;
         }
       }
     }
-    if(result) {
+    if (result) {
       $location.path(result.path);
       $scope.hideResults();
     }
@@ -92,10 +90,12 @@ angular.module('search', [])
   // It should only be used where the browser does not support WebWorkers
   function localSearchFactory($http, $timeout, NG_PAGES) {
 
-    console.log('Using Local Search Index');
+    if (window.console && window.console.log) {
+      window.console.log('Using Local Search Index');
+    }
 
     // Create the lunr index
-    var index = lunr(function() {
+    var index = lunr(/** @this */ function() {
       this.ref('path');
       this.field('titleWords', {boost: 50});
       this.field('members', { boost: 40});
@@ -136,12 +136,14 @@ angular.module('search', [])
   // It should only be used where the browser does support WebWorkers
   function webWorkerSearchFactory($q, $rootScope, NG_PAGES) {
 
-    console.log('Using WebWorker Search Index')
+    if (window.console && window.console.log) {
+      window.console.log('Using WebWorker Search Index');
+    }
 
     var searchIndex = $q.defer();
     var results;
 
-    var worker = new Worker('js/search-worker.js');
+    var worker = new window.Worker('js/search-worker.js');
 
     // The worker will send us a message in two situations:
     // - when the index has been built, ready to run a query
@@ -149,7 +151,7 @@ angular.module('search', [])
     worker.onmessage = function(oEvent) {
       $rootScope.$apply(function() {
 
-        switch(oEvent.data.e) {
+        switch (oEvent.data.e) {
           case 'index-ready':
             searchIndex.resolve();
             break;
@@ -206,7 +208,7 @@ angular.module('search', [])
         FORWARD_SLASH_KEYCODE = 191;
     angular.element($document[0].body).on('keydown', function(event) {
       var input = element[0];
-      if(event.keyCode == FORWARD_SLASH_KEYCODE && document.activeElement != input) {
+      if (event.keyCode === FORWARD_SLASH_KEYCODE && window.document.activeElement !== input) {
         event.stopPropagation();
         event.preventDefault();
         input.focus();
@@ -214,7 +216,7 @@ angular.module('search', [])
     });
 
     element.on('keydown', function(event) {
-      if(event.keyCode == ESCAPE_KEY_KEYCODE) {
+      if (event.keyCode === ESCAPE_KEY_KEYCODE) {
         event.stopPropagation();
         event.preventDefault();
         scope.$apply(function() {

docs/app/src/tutorials.js

@@ -1,3 +1,5 @@
+'use strict';
+
 angular.module('tutorials', [])
 
 .directive('docTutorialNav', function() {
@@ -5,7 +7,8 @@ angular.module('tutorials', [])
     '',
     'step_00', 'step_01', 'step_02', 'step_03', 'step_04',
     'step_05', 'step_06', 'step_07', 'step_08', 'step_09',
-    'step_10', 'step_11', 'step_12', 'the_end'
+    'step_10', 'step_11', 'step_12', 'step_13', 'step_14',
+    'the_end'
   ];
   return {
     scope: {},
@@ -19,7 +22,7 @@ angular.module('tutorials', [])
       scope.seq = seq;
       scope.prev = pages[seq];
       scope.next = pages[2 + seq];
-      scope.diffLo = seq ? (seq - 1): '0~1';
+      scope.diffLo = seq ? (seq - 1) : '0~1';
       scope.diffHi = seq;
 
       element.addClass('btn-group');
@@ -39,11 +42,11 @@ angular.module('tutorials', [])
       '<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: '+
+      '  <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' +
       '</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/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}" title="See diff on Github">GitHub</a>.\n' +
       '</p>'
   };
-});
+});

docs/app/src/versions.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 angular.module('versions', [])
 
@@ -6,7 +6,7 @@ angular.module('versions', [])
   $scope.docs_version  = NG_VERSIONS[0];
   $scope.docs_versions = NG_VERSIONS;
 
-  for(var i=0, minor = NaN; i < NG_VERSIONS.length; i++) {
+  for (var i = 0, minor = NaN; i < NG_VERSIONS.length; i++) {
     var version = NG_VERSIONS[i];
     // NaN will give false here
     if (minor <= version.minor) {
@@ -25,7 +25,7 @@ angular.module('versions', [])
         url = '';
     if (version.isOldDocsUrl) {
       url = version.docsUrl;
-    }else{
+    } else {
       url = version.docsUrl + currentPagePath;
     }
     $window.location = url;

docs/app/test/.eslintrc.json

@@ -0,0 +1,23 @@
+{
+  "root": true,
+  "extends": "../../../.eslintrc-browser.json",
+
+  "env": {
+    "jasmine": true
+  },
+
+  "rules": {
+    // Some rules are not that important in tests and conflict with
+    // Jasmine or would make it easier to write some tests; we disable
+    // those ones here.
+    "no-invalid-this": "off",
+    "no-throw-literal": "off",
+    "no-unused-vars": "off"
+  },
+
+  "globals": {
+    // ngMocks
+    "module": false,
+    "inject": true
+  }
+}

docs/app/test/.jshintrc

@@ -1,25 +0,0 @@
-{
-  "extends": "../../../.jshintrc-base",
-  "browser": true,
-  "globals": {
-    // AngularJS
-    "angular": false,
-
-    // ngMocks
-    "module": false,
-    "inject": true,
-
-    // Jasmine
-    "jasmine": false,
-    "describe": false,
-    "ddescribe": false,
-    "xdescribe": false,
-    "it": false,
-    "iit": false,
-    "xit": false,
-    "beforeEach": false,
-    "afterEach": false,
-    "spyOn": false,
-    "expect": false
-  }
-}

docs/app/test/directivesSpec.js

@@ -1,4 +1,6 @@
-describe("code", function() {
+'use strict';
+
+describe('code', function() {
   var prettyPrintOne, oldPP;
   var compile, scope;
 

docs/app/test/docsSpec.js

@@ -1,4 +1,6 @@
-describe("DocsController", function() {
+'use strict';
+
+describe('DocsController', function() {
   var $scope;
 
   angular.module('fake', [])
@@ -15,7 +17,7 @@ describe("DocsController", function() {
 
 
   describe('afterPartialLoaded', function() {
-    it("should update the Google Analytics with currentPage path if currentPage exists", inject(function($window) {
+    it('should update the Google Analytics with currentPage path if currentPage exists', inject(function($window) {
       $window._gaq = [];
       $scope.currentPage = { path: 'a/b/c' };
       $scope.$broadcast('$includeContentLoaded');
@@ -23,7 +25,7 @@ describe("DocsController", function() {
     }));
 
 
-    it("should update the Google Analytics with $location.path if currentPage is missing", inject(function($window, $location) {
+    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');
       $scope.$broadcast('$includeContentLoaded');

docs/app/test/errorsSpec.js

@@ -135,7 +135,7 @@ describe('errors', function() {
     }));
 
 
-    it('should set the element\s HTML', function() {
+    it('should set the element\'s HTML', function() {
       var elem = $compile('<span error-display="bar">foo</span>')($rootScope);
       expect(elem.html()).toBe('bar');
     });
@@ -152,7 +152,7 @@ describe('errors', function() {
     it('should pass the interpolated text through `errorLinkFilter`', function() {
       $location.search = jasmine.createSpy('search').and.returnValue({p0: 'foo'});
 
-      var elem = $compile('<span error-display="foo = {0}"></span>')($rootScope);
+      $compile('<span error-display="foo = {0}"></span>')($rootScope);
       expect(errorLinkFilter).toHaveBeenCalledTimes(1);
       expect(errorLinkFilter).toHaveBeenCalledWith('foo = foo', '_blank');
     });

docs/bower.json

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

docs/config/index.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var path = require('canonical-path');
 var packagePath = __dirname;
@@ -55,6 +55,7 @@ module.exports = new Package('angularjs', [
   parseTagsProcessor.tagDefinitions.push(require('./tag-defs/tutorial-step'));
   parseTagsProcessor.tagDefinitions.push(require('./tag-defs/sortOrder'));
   parseTagsProcessor.tagDefinitions.push(require('./tag-defs/installation'));
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/this'));
 })
 
 
@@ -87,7 +88,7 @@ module.exports = new Package('angularjs', [
     docTypes: ['overview', 'tutorial'],
     getPath: function(doc) {
       var docPath = path.dirname(doc.fileInfo.relativePath);
-      if ( doc.fileInfo.baseName !== 'index' ) {
+      if (doc.fileInfo.baseName !== 'index') {
         docPath = path.join(docPath, doc.fileInfo.baseName);
       }
       return docPath;
@@ -108,12 +109,12 @@ module.exports = new Package('angularjs', [
   });
 
   computePathsProcessor.pathTemplates.push({
-    docTypes: ['module' ],
+    docTypes: ['module'],
     pathTemplate: '${area}/${name}',
     outputPathTemplate: 'partials/${area}/${name}.html'
   });
   computePathsProcessor.pathTemplates.push({
-    docTypes: ['componentGroup' ],
+    docTypes: ['componentGroup'],
     pathTemplate: '${area}/${moduleName}/${groupType}',
     outputPathTemplate: 'partials/${area}/${moduleName}/${groupType}.html'
   });

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

@@ -1,5 +1,6 @@
-"use strict";
+'use strict';
 
+// eslint-disable-next-line new-cap
 var encoder = new require('node-html-encoder').Encoder();
 
 /**
@@ -11,7 +12,7 @@ module.exports = function typeInlineTagDef(getTypeClass) {
   return {
     name: 'type',
     handler: function(doc, tagName, tagDescription) {
-      return '<a href="" class="' + getTypeClass(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
+      return '<a href="" class="' + getTypeClass(tagDescription) + '">' + encoder.htmlEncode(tagDescription) + '</a>';
     }
   };
-};
+};

docs/config/processors/error-docs.js

@@ -1,7 +1,4 @@
-"use strict";
-
-var _ = require('lodash');
-var path = require('canonical-path');
+'use strict';
 
 /**
  * @dgProcessor errorDocsProcessor
@@ -18,7 +15,7 @@ module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
       docs.forEach(function(doc) {
         var parts, namespaceDoc;
 
-        if ( doc.docType === 'error' ) {
+        if (doc.docType === 'error') {
 
           // Parse out the error info from the id
           parts = doc.name.split(':');
@@ -27,7 +24,7 @@ module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
 
           // Get or create the relevant errorNamespace doc
           namespaceDoc = errorNamespaceMap.get(doc.namespace);
-          if ( !namespaceDoc ) {
+          if (!namespaceDoc) {
             namespaceDoc = {
               area: 'error',
               name: doc.namespace,
@@ -49,4 +46,4 @@ module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
       });
     }
   };
-};
+};

docs/config/processors/index-page.js

@@ -1,7 +1,6 @@
-"use strict";
+'use strict';
 
 var _ = require('lodash');
-var path = require('canonical-path');
 
 /**
  * @dgProcessor generateIndexPagesProcessor
@@ -21,7 +20,7 @@ module.exports = function generateIndexPagesProcessor() {
       // Collect up all the areas in the docs
       var areas = {};
       docs.forEach(function(doc) {
-        if ( doc.area ) {
+        if (doc.area) {
           areas[doc.area] = doc.area;
         }
       });
@@ -40,4 +39,4 @@ module.exports = function generateIndexPagesProcessor() {
       });
     }
   };
-};
+};

docs/config/processors/keywords.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var _ = require('lodash');
 var fs = require('fs');
@@ -37,7 +37,7 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
       var KEYWORD_REGEX = /^((ng:|[\$_a-z])[\w\-_]+)/;
 
       // Load up the keywords to ignore, if specified in the config
-      if ( this.ignoreWordsFile ) {
+      if (this.ignoreWordsFile) {
 
         var ignoreWordsPath = path.resolve(readFilesProcessor.basePath, this.ignoreWordsFile);
         wordsToIgnore = fs.readFileSync(ignoreWordsPath, 'utf8').toString().split(/[,\s\n\r]+/gm);
@@ -59,7 +59,7 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
       // without the ng to the title text, e.g. "controller".
       function extractTitleWords(title) {
         var match = /ng([A-Z]\w*)/.exec(title);
-        if ( match ) {
+        if (match) {
           title = title + ' ' + match[1].toLowerCase();
         }
         return title;
@@ -68,11 +68,11 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
     function extractWords(text, words, keywordMap) {
 
       var tokens = text.toLowerCase().split(/[\.\s,`'"#]+/mg);
-      _.forEach(tokens, function(token){
+      _.forEach(tokens, function(token) {
         var match = token.match(KEYWORD_REGEX);
-        if (match){
+        if (match) {
           var key = match[1];
-          if ( !keywordMap[key]) {
+          if (!keywordMap[key]) {
             keywordMap[key] = true;
             words.push(key);
           }
@@ -96,11 +96,11 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
         // Search each top level property of the document for search terms
         _.forEach(doc, function(value, key) {
 
-          if ( _.isString(value) && !propertiesToIgnore[key] ) {
+          if (_.isString(value) && !propertiesToIgnore[key]) {
             extractWords(value, words, keywordMap);
           }
 
-          if ( key === 'methods' || key === 'properties' || key === 'events' ) {
+          if (key === 'methods' || key === 'properties' || key === 'events') {
             _.forEach(value, function(member) {
               extractWords(member.name, members, membersMap);
             });

docs/config/processors/pages-data.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var _ = require('lodash');
 var path = require('canonical-path');
@@ -67,7 +67,7 @@ module.exports = function generatePagesDataProcessor(log) {
             })
 
             .tap(function(docTypes) {
-              if ( docTypes.input ) {
+              if (docTypes.input) {
                 docTypes.directive = docTypes.directive || [];
                 // Combine input docTypes into directive docTypes
                 docTypes.directive = docTypes.directive.concat(docTypes.input);
@@ -79,7 +79,7 @@ module.exports = function generatePagesDataProcessor(log) {
 
               sectionPages = _.sortBy(sectionPages, 'name');
 
-              if ( sectionPages.length > 0 ) {
+              if (sectionPages.length > 0) {
                 // Push a navItem for this section
                 navItems.push({
                   name: sectionName,
@@ -158,7 +158,7 @@ module.exports = function generatePagesDataProcessor(log) {
 
       // We are only interested in pages that are not landing pages
       var navPages = _.filter(pages, function(page) {
-        return page.docType != 'componentGroup';
+        return page.docType !== 'componentGroup';
       });
 
       // Generate an object collection of pages that is grouped by area e.g.

docs/config/processors/versions-data.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var _ = require('lodash');
 
@@ -31,4 +31,4 @@ module.exports = function generateVersionDocProcessor(gitData) {
       docs.push(versionDoc);
     }
   };
-};
+};

docs/config/services/deployments/debug.js

@@ -1,11 +1,11 @@
-"use strict";
+'use strict';
 
 module.exports = function debugDeployment(getVersion) {
   return {
     name: 'debug',
     examples: {
       commonFiles: {
-        scripts: [ '../../../angular.js' ]
+        scripts: ['../../../angular.js']
       },
       dependencyPath: '../../../'
     },
@@ -35,4 +35,4 @@ module.exports = function debugDeployment(getVersion) {
       'css/animations.css'
     ]
   };
-};
+};

docs/config/services/deployments/default.js

@@ -1,11 +1,11 @@
-"use strict";
+'use strict';
 
 module.exports = function defaultDeployment(getVersion) {
   return {
     name: 'default',
     examples: {
       commonFiles: {
-        scripts: [ '../../../angular.min.js' ]
+        scripts: ['../../../angular.min.js']
       },
       dependencyPath: '../../../'
     },
@@ -35,4 +35,4 @@ module.exports = function defaultDeployment(getVersion) {
       'css/animations.css'
     ]
   };
-};
+};

docs/config/services/deployments/jquery.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 module.exports = function jqueryDeployment(getVersion) {
   return {
@@ -39,4 +39,4 @@ module.exports = function jqueryDeployment(getVersion) {
       'css/animations.css'
     ]
   };
-};
+};

docs/config/services/deployments/production.js

@@ -1,14 +1,14 @@
-"use strict";
+'use strict';
 
 var versionInfo = require('../../../../lib/versions/version-info');
-var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + versionInfo.cdnVersion;
+var cdnUrl = '//ajax.googleapis.com/ajax/libs/angularjs/' + versionInfo.cdnVersion;
 
 module.exports = function productionDeployment(getVersion) {
   return {
     name: 'production',
     examples: {
       commonFiles: {
-        scripts: [ cdnUrl + '/angular.min.js' ]
+        scripts: [cdnUrl + '/angular.min.js']
       },
       dependencyPath: cdnUrl + '/'
     },
@@ -38,4 +38,4 @@ module.exports = function productionDeployment(getVersion) {
       'css/animations.css'
     ]
   };
-};
+};

docs/config/services/errorNamespaceMap.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 var StringMap = require('stringmap');
 
 /**
@@ -7,4 +7,4 @@ var StringMap = require('stringmap');
  */
 module.exports = function errorNamespaceMap() {
   return new StringMap();
-};
+};

docs/config/services/getMinerrInfo.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var path = require('canonical-path');
 

docs/config/services/getVersion.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 var path = require('canonical-path');
 
 /**
@@ -14,4 +14,4 @@ module.exports = function getVersion(readFilesProcessor) {
     packageFile = packageFile || 'bower.json';
     return require(path.join(sourceFolder,component,packageFile)).version;
   };
-};
+};

docs/config/tag-defs/installation.js

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

docs/config/tag-defs/sortOrder.js

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

docs/config/tag-defs/this.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  name: 'this'
+};

docs/config/tag-defs/tutorial-step.js

@@ -1,7 +1,9 @@
+'use strict';
+
 module.exports = {
   name: 'step',
   transforms: function(doc, tag, value) {
-    if ( doc.docType !== 'tutorial' ) {
+    if (doc.docType !== 'tutorial') {
       throw new Error('Invalid tag, step.  You should only use this tag on tutorial docs');
     }
     return parseInt(value,10);

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

@@ -0,0 +1,66 @@
+{% extends "base.template.html" %}
+
+{% block content %}
+
+<a href='https://github.com/{$ git.info.owner $}/{$ git.info.repo $}/tree/{$ git.version.isSnapshot and 'master' or git.version.raw $}/{$ doc.fileInfo.projectRelativePath $}#L{$ doc.startingLine $}' class='view-source pull-right btn btn-primary'>
+  <i class="glyphicon glyphicon-zoom-in">&nbsp;</i>View Source
+</a>
+
+{% block header %}
+<header class="api-profile-header">
+  <h1 class="api-profile-header-heading">{$ doc.name $}</h1>
+  <ol class="api-profile-header-structure naked-list step-list">
+    {% block related_components %}{% endblock %}
+    <li>
+      - {$ doc.docType $} in module <a href="{$ doc.moduleDoc.path $}">{$ doc.moduleDoc.name $}</a>
+    </li>
+  </ol>
+</header>
+{% endblock %}
+
+{% block description %}
+<div class="api-profile-description">
+  {$ doc.description | marked $}
+</div>
+{% endblock %}
+
+{% if doc.knownIssues %}
+<h2 id="known-issues">Known Issues</h2>
+{% for issue in doc.knownIssues -%}
+<div class="known-issue">
+  {$ issue | marked $}  {% if not loop.last %}<hr>{% endif %}
+</div>
+{% endfor -%}
+{% endif %}
+
+{% if doc.deprecated %}
+<fieldset class="deprecated">
+  <legend>Deprecated API</legend>
+  {$ doc.deprecated| marked $}
+</fieldset>
+{% endif %}
+
+<div>
+  {% block dependencies %}
+  {%- if doc.requires %}
+  <h2 id="dependencies">Dependencies</h2>
+  <ul>
+    {% for require in doc.requires %}<li>{$ require | link $}</li>{% endfor %}
+  </ul>
+  {% endif -%}
+  {% endblock %}
+
+  {% block additional %}
+  {% endblock %}
+
+  {% block examples %}
+  {%- if doc.examples %}
+  <h2 id="example">Example</h2>
+  {%- for example in doc.examples -%}
+    {$ example | marked $}
+  {%- endfor -%}
+  {% endif -%}
+  {% endblock %}
+</div>
+
+{% endblock %}

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

@@ -5,35 +5,41 @@
   {% if doc.title %}{$ doc.title | marked $}{% else %}{$ doc.name | code $}{% endif %}
 </h1>
 
+<h2>Installation</h2>
 {% 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>
+  <p>First, get the file:</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 $}
+      <a href="https://developers.google.com/speed/libraries/devguide#angularjs">Google CDN</a> e.g.
+      {% code %}"//ajax.googleapis.com/ajax/libs/angularjs/X.Y.Z/{$ doc.packageFile $}"{% endcode %}
     </li>
     <li>
-      <a href="http://bower.io">Bower</a><br>
-      e.g. {% code %}bower install {$ doc.packageName $}@X.Y.Z{% endcode %}
+      <a href="https://www.npmjs.com/">NPM</a> e.g.
+      {% code %}npm 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 %}
+      <a href="http://bower.io">Bower</a> e.g.
+      {% code %}bower install {$ doc.packageName $}#X.Y.Z{% endcode %}
+    </li>
+    <li>
+      <a href="https://code.angularjs.org/">code.angularjs.org</a>
+      (discouraged for production use) 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>
+
+  <p>Then, include {$ doc.packageFile | code $} in your HTML:</p>
+
+  {% code %}
+      <script src="path/to/angular.js"></script>
+      <script src="path/to/{$ doc.packageFile $}"></script>
+  {% endcode %}
+
+  <p>Finally, load the module in your application by adding it as a dependent module:</p>
   {% code %}
     angular.module('app', ['{$ doc.name $}']);
   {% endcode %}
@@ -53,7 +59,7 @@
     <td>{$ issueDoc.id | link(issueDoc.name, issueDoc) $}</td>
     <td>
     {% for issue in issueDoc.knownIssues -%}
-      {$ issue | marked $}
+      {$ issue | marked $} {% if not loop.last %}<hr>{% endif %}
     {% endfor -%}
     </td>
   </tr>
@@ -63,6 +69,7 @@
 {% endif %}
 
 
+{% if doc.componentGroups.length %}
 <div class="component-breakdown">
   <h2>Module Components</h2>
   {% for componentGroup in doc.componentGroups %}
@@ -83,6 +90,7 @@
   </div>
   {% endfor %}
 </div>
+{% endif %}
 
 {% if doc.usage %}
   <h2>Usage</h2>

docs/config/templates/indexPage.template.html

@@ -228,10 +228,10 @@
           )
         </p>
         <p>
-          Code licensed under the
-          <a href="https://github.com/angular/angular.js/blob/master/LICENSE" target="_blank">The
-            MIT License</a>. Documentation licensed under <a
-              href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.
+          Code licensed under
+          <a href="https://github.com/angular/angular.js/blob/master/LICENSE" target="_blank">The MIT License</a>.
+          Documentation licensed under
+          <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.
         </p>
       </div>
     </footer>

docs/config/templates/nav-data.template.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Meta data used by the AngularJS docs app
 angular.module('navData', [])
   .value('NG_NAVIGATION', {$ doc.areas | json $});

docs/config/templates/pages-data.template.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Meta data used by the AngularJS docs app
 angular.module('pagesData', [])
   .value('NG_PAGES', {$ doc.pages | json $});

docs/config/templates/versions-data.template.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Meta data used by the AngularJS docs app
 angular.module('versionsData', [])
   .value('NG_VERSION', {$ doc.currentVersion | json $})

docs/content/api/index.ngdoc

@@ -8,6 +8,8 @@ Welcome to the AngularJS API docs page. These pages contain the AngularJS refere
 The documentation is organized into **{@link guide/module modules}** which contain various components of an AngularJS application.
 These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks.
 
+There is also a {@link guide/index guide} with articles on various topics, and a list of external resources.
+
 <div class="alert alert-info">
 **Angular Prefixes `$` and `$$`**:
 

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

@@ -0,0 +1,47 @@
+@ngdoc error
+@name $compile:reqslot
+@fullName Required transclusion slot
+@description
+
+This error occurs when a directive or component try to transclude a slot that is not provided.
+
+Transcluded elements must contain something. This error could happen when you try to transclude a self closing tag element.
+Also you can make a transclusion slot optional with a `?` prefix.
+
+```js
+// In this example the <my-component> must have an <important-component> inside to transclude it.
+// If not, a reqslot error will be generated.
+
+var componentConfig = {
+  template: 'path/to/template.html',
+  transclude: {
+    importantSlot: 'importantComponent', // mandatory transclusion
+    optionalSlot: '?optionalComponent',  // optional transclusion
+  }
+};
+
+angular
+  .module('doc')
+  .component('myComponent', componentConfig)
+
+```
+
+```html
+<!-- Will not work because <important-component> is missing -->
+<my-component>
+</my-component>
+
+<my-component>
+  <optional-component></optional-component>
+</my-component>
+
+<!-- Will work -->
+<my-component>
+  <important-component></important-component>
+</my-component>
+
+<my-component>
+  <optional-component></optional-component>
+  <important-component></important-component>
+</my-component>
+```

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

@@ -0,0 +1,9 @@
+@ngdoc error
+@name $location:badpath
+@fullName Invalid Path
+@description
+
+This error occurs when the path of a location contains invalid characters.
+The most common fault is when the path starts with double slashes (`//`) or backslashes ('\\').
+For example if the base path of an application is `https://a.b.c/` then the following path is
+invalid `https://a.b.c///d/e/f`.

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

@@ -0,0 +1,12 @@
+@ngdoc error
+@name $parse:isecaf
+@fullName Assigning to Fields of Disallowed Context
+@description
+
+Occurs when an expression attempts to assign a value on a field of any of the `Boolean`, `Number`,
+`String`, `Array`, `Object`, or `Function` constructors or the corresponding prototypes.
+
+Angular bans the modification of these constructors or their prototypes from within expressions,
+since it is a known way to modify the behaviour of existing functions/operations.
+
+To resolve this error, avoid assigning to fields of constructors or their prototypes in expressions.

docs/content/error/$rootScope/inprog.ngdoc

@@ -222,7 +222,7 @@ value of its attribute becomes true.
     angular.module('app', []).directive('setFocusIf', function() {
       return function link($scope, $element, $attr) {
         $scope.$watch($attr.setFocusIf, function(value) {
-          if ( value ) { $element[0].focus(); }
+          if (value) { $element[0].focus(); }
         });
       };
     });

docs/content/error/ngModel/numfmt.ngdoc

@@ -3,7 +3,8 @@
 @fullName Model is not of type `number`
 @description
 
-The number input directive `<input type="number">` requires the model to be a `number`.
+The `input[type="number"]` and `input[type="range"][ng-input-range]` directives require the model to
+be a `number`.
 
 If the model is something else, this error will be thrown.
 
@@ -17,10 +18,10 @@ pipeline.
 ## Example
 
 In this example, our model stores the number as a string, so we provide the `stringToNumber`
-directive to convert it into the format the `input[number]` directive expects.
+directive to convert it into the format the `input[type="number"]` directive expects.
 
 
-<example module="numfmt-error-module">
+<example module="numfmt-error-module" name="number-format-error">
  <file name="index.html">
   <table>
     <tr ng-repeat="x in ['0', '1']">
@@ -47,10 +48,10 @@ directive to convert it into the format the `input[number]` directive expects.
           return '' + value;
         });
         ngModel.$formatters.push(function(value) {
-          return parseFloat(value, 10);
+          return parseFloat(value);
         });
       }
     };
   });
  </file>
-</example>
+</example>

docs/content/guide/$location.ngdoc

@@ -227,18 +227,18 @@ it('should show example', inject(
   },
   function($location) {
     // open http://example.com/base/index.html#!/a
-    $location.absUrl() == 'http://example.com/base/index.html#!/a'
-    $location.path() == '/a'
+    $location.absUrl() === 'http://example.com/base/index.html#!/a'
+    $location.path() === '/a'
 
     $location.path('/foo')
-    $location.absUrl() == 'http://example.com/base/index.html#!/foo'
+    $location.absUrl() === 'http://example.com/base/index.html#!/foo'
 
-    $location.search() == {}
+    $location.search() === {}
     $location.search({a: 'b', c: true});
-    $location.absUrl() == 'http://example.com/base/index.html#!/foo?a=b&c'
+    $location.absUrl() === 'http://example.com/base/index.html#!/foo?a=b&c'
 
     $location.path('/new').search('x=y');
-    $location.absUrl() == 'http://example.com/base/index.html#!/new?x=y'
+    $location.absUrl() === 'http://example.com/base/index.html#!/new?x=y'
   }
 ));
 ```
@@ -271,29 +271,29 @@ it('should show example', inject(
     // in browser with HTML5 history support:
     // open http://example.com/#!/a -> rewrite to http://example.com/a
     // (replacing the http://example.com/#!/a history record)
-    $location.path() == '/a'
+    $location.path() === '/a'
 
     $location.path('/foo');
-    $location.absUrl() == 'http://example.com/foo'
+    $location.absUrl() === 'http://example.com/foo'
 
-    $location.search() == {}
+    $location.search() === {}
     $location.search({a: 'b', c: true});
-    $location.absUrl() == 'http://example.com/foo?a=b&c'
+    $location.absUrl() === 'http://example.com/foo?a=b&c'
 
     $location.path('/new').search('x=y');
-    $location.url() == 'new?x=y'
-    $location.absUrl() == 'http://example.com/new?x=y'
+    $location.url() === 'new?x=y'
+    $location.absUrl() === 'http://example.com/new?x=y'
 
     // in browser without html5 history support:
     // open http://example.com/new?x=y -> redirect to http://example.com/#!/new?x=y
     // (again replacing the http://example.com/new?x=y history item)
-    $location.path() == '/new'
-    $location.search() == {x: 'y'}
+    $location.path() === '/new'
+    $location.search() === {x: 'y'}
 
     $location.path('/foo/bar');
-    $location.path() == '/foo/bar'
-    $location.url() == '/foo/bar?x=y'
-    $location.absUrl() == 'http://example.com/#!/foo/bar?x=y'
+    $location.path() === '/foo/bar'
+    $location.url() === '/foo/bar?x=y'
+    $location.absUrl() === 'http://example.com/#!/foo/bar?x=y'
   }
 ));
 ```
@@ -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
@@ -409,11 +409,11 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
    .constant('baseHref', '/base/index.html')
    .value('$sniffer', { history: true })
 
-   .controller("LocationController", function($scope, $location) {
+   .controller('LocationController', function($scope, $location) {
      $scope.$location = {};
-     angular.forEach("protocol host port path search hash".split(" "), function(method){
-      $scope.$location[method] = function(){
-        var result = $location[method].call($location);
+     angular.forEach('protocol host port path search hash'.split(' '), function(method) {
+      $scope.$location[method] = function() {
+        var result = $location[method]();
         return angular.isObject(result) ? angular.toJson(result) : result;
       };
      });
@@ -460,8 +460,8 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
    .directive('ngAddressBar', function($browser, $timeout) {
       return {
         template: 'Address: <input id="addressBar" type="text" style="width: 400px" >',
-        link: function(scope, element, attrs){
-          var input = element.children("input"), delay;
+        link: function(scope, element, attrs) {
+          var input = element.children('input'), delay;
 
           input.on('keypress keyup keydown', function(event) {
                   delay = (!delay ? $timeout(fireUrlChange, 250) : null);
@@ -488,7 +488,7 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
         url = 'http://www.example.com/base/path?a=b#h';
 
 
-    it("should show fake browser info on load", function(){
+    it("should show fake browser info on load", function() {
       expect(addressBar.getAttribute('value')).toBe(url);
 
       expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
@@ -500,7 +500,7 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
 
     });
 
-    it("should change $location accordingly", function(){
+    it("should change $location accordingly", function() {
       var navigation = element.all(by.css("#navigation a"));
 
       navigation.get(0).click();
@@ -563,11 +563,11 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
       $locationProvider.html5Mode(true).hashPrefix('!');
     })
 
-    .controller("LocationController", function($scope, $location) {
+    .controller('LocationController', function($scope, $location) {
       $scope.$location = {};
-      angular.forEach("protocol host port path search hash".split(" "), function(method){
-        $scope.$location[method] = function(){
-          var result = $location[method].call($location);
+      angular.forEach('protocol host port path search hash'.split(' '), function(method) {
+        $scope.$location[method] = function() {
+          var result = $location[method]();
           return angular.isObject(result) ? angular.toJson(result) : result;
         };
       });
@@ -614,8 +614,8 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
    .directive('ngAddressBar', function($browser, $timeout) {
       return {
         template: 'Address: <input id="addressBar" type="text" style="width: 400px" >',
-        link: function(scope, element, attrs){
-          var input = element.children("input"), delay;
+        link: function(scope, element, attrs) {
+          var input = element.children('input'), delay;
 
           input.on('keypress keyup keydown', function(event) {
                   delay = (!delay ? $timeout(fireUrlChange, 250) : null);
@@ -641,7 +641,7 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
     var addressBar = element(by.css("#addressBar")),
          url = 'http://www.example.com/base/index.html#!/path?a=b#h';
 
-    it("should show fake browser info on load", function(){
+    it("should show fake browser info on load", function() {
       expect(addressBar.getAttribute('value')).toBe(url);
 
       expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
@@ -653,7 +653,7 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
 
     });
 
-    it("should change $location accordingly", function(){
+    it("should change $location accordingly", function() {
       var navigation = element.all(by.css("#navigation a"));
 
       navigation.get(0).click();
@@ -735,7 +735,7 @@ ng.$rootScope.Scope scope} life-cycle. This means it's your responsibility to ca
 ```js
 describe('serviceUnderTest', function() {
   beforeEach(module(function($provide) {
-    $provide.factory('serviceUnderTest', function($location){
+    $provide.factory('serviceUnderTest', function($location) {
       // whatever it does...
     });
   });
@@ -834,7 +834,7 @@ then uses the information it obtains to compose hashbang URLs (such as
 Because `$location` uses getters/setters, you can use `ng-model-options="{ getterSetter: true }"`
 to bind it to `ngModel`:
 
-<example module="locationExample">
+<example module="locationExample" name="location-two-way-binding">
 <file name="index.html">
 <div ng-controller="LocationController">
   <input type="text" ng-model="locationPath" ng-model-options="{ getterSetter: true }" />
@@ -843,7 +843,7 @@ to bind it to `ngModel`:
 <file name="script.js">
 angular.module('locationExample', [])
   .controller('LocationController', ['$scope', '$location', function($scope, $location) {
-    $scope.locationPath = function (newLocation) {
+    $scope.locationPath = function(newLocation) {
       return $location.path(newLocation);
     };
   }]);

docs/content/guide/accessibility.ngdoc

@@ -62,7 +62,7 @@ attributes (if they have not been explicitly specified by the developer):
 
 ### Example
 
-<example module="ngAria_ngModelExample" deps="angular-aria.js">
+<example module="ngAria_ngModelExample" deps="angular-aria.js" name="accessibility-ng-model">
   <file name="index.html">
     <form ng-controller="formsController">
       <some-checkbox role="checkbox" ng-model="checked" ng-class="{active: checked}"
@@ -74,20 +74,20 @@ attributes (if they have not been explicitly specified by the developer):
     </form>
   </file>
   <file name="script.js">
-    var app = angular.module('ngAria_ngModelExample', ['ngAria'])
-    .controller('formsController', function($scope){
+    angular.module('ngAria_ngModelExample', ['ngAria'])
+    .controller('formsController', function($scope) {
       $scope.checked = false;
-      $scope.toggleCheckbox = function(){
+      $scope.toggleCheckbox = function() {
         $scope.checked = !$scope.checked;
       };
     })
-    .directive('someCheckbox', function(){
+    .directive('someCheckbox', function() {
       return {
         restrict: 'E',
         link: function($scope, $el, $attrs) {
-          $el.on('keypress', function(event){
+          $el.on('keypress', function(event) {
             event.preventDefault();
-            if(event.keyCode === 32 || event.keyCode === 13){
+            if (event.keyCode === 32 || event.keyCode === 13) {
               $scope.toggleCheckbox();
               $scope.$apply();
             }
@@ -331,7 +331,7 @@ The attribute magic of ngAria may not work for every scenario. To disable indivi
 you can use the {@link ngAria.$ariaProvider#config config} method. Just keep in mind this will
 tell ngAria to ignore the attribute globally.
 
-<example module="ngAria_ngClickExample" deps="angular-aria.js">
+<example module="ngAria_ngClickExample" deps="angular-aria.js" name="accessibility-ng-click">
  <file name="index.html">
   <div ng-click="someFunction" show-attrs>
     &lt;div&gt; with ng-click and bindRoleForClick, tabindex set to false

docs/content/guide/animations.ngdoc

@@ -12,35 +12,41 @@ triggered, will attempt to perform a CSS Transition, CSS Keyframe Animation or a
 placed on the given directive). Animations can be placed using vanilla CSS by following the naming conventions set in place by AngularJS
 or with JavaScript code when it's defined as a factory.
 
+<div class="alert alert-info">
+  Note that we have used non-prefixed CSS transition properties in our examples as the major browsers now support non-prefixed
+  properties. If you intend to support older browsers or certain mobile browsers then you will need to include prefixed
+  versions of the transition properties.  Take a look at http://caniuse.com/#feat=css-transitions for what browsers require prefixes,
+  and https://github.com/postcss/autoprefixer for a tool that can automatically generate the prefixes for you.
+</div>
+
 Animations are not available unless you include the {@link ngAnimate `ngAnimate` module} as a dependency within your application.
 
 Below is a quick example of animations being enabled for `ngShow` and `ngHide`:
 
-<example module="ngAnimate" deps="angular-animate.js" animations="true">
+<example module="ngAnimate" deps="angular-animate.js" animations="true" name="animate-ng-show">
   <file name="index.html">
-    <div ng-init="checked=true">
+    <div ng-init="checked = true">
       <label>
-        <input type="checkbox" ng-model="checked" style="float:left; margin-right:10px;"> Is Visible...
+        <input type="checkbox" ng-model="checked" />
+        Is visible
       </label>
-      <div class="check-element sample-show-hide" ng-show="checked" style="clear:both;">
-        Visible...
+      <div class="content-area sample-show-hide" ng-show="checked">
+        Content...
       </div>
     </div>
   </file>
   <file name="animations.css">
-    .sample-show-hide {
-      padding:10px;
-      border:1px solid black;
-      background:white;
+    .content-area {
+      border: 1px solid black;
+      margin-top: 10px;
+      padding: 10px;
     }
 
     .sample-show-hide {
-      -webkit-transition:all linear 0.5s;
-      transition:all linear 0.5s;
+      transition: all linear 0.5s;
     }
-
     .sample-show-hide.ng-hide {
-      opacity:0;
+      opacity: 0;
     }
   </file>
 </example>
@@ -80,11 +86,8 @@ occur when ngRepeat triggers them:
   class
 */
 .repeated-item.ng-enter, .repeated-item.ng-move {
-  -webkit-transition:0.5s linear all;
-  -moz-transition:0.5s linear all;
-  -o-transition:0.5s linear all;
-  transition:0.5s linear all;
-  opacity:0;
+  transition: all 0.5s linear;
+  opacity: 0;
 }
 
 /*
@@ -95,7 +98,7 @@ occur when ngRepeat triggers them:
 */
 .repeated-item.ng-enter.ng-enter-active,
 .repeated-item.ng-move.ng-move-active {
-  opacity:1;
+  opacity: 1;
 }
 
 /*
@@ -104,10 +107,7 @@ occur when ngRepeat triggers them:
   that has the .repeated-item class
 */
 .repeated-item.ng-leave {
-  -webkit-animation:0.5s my_animation;
-  -moz-animation:0.5s my_animation;
-  -o-animation:0.5s my_animation;
-  animation:0.5s my_animation;
+  animation: 0.5s my_animation;
 }
 
 @keyframes my_animation {
@@ -115,24 +115,6 @@ occur when ngRepeat triggers them:
   to { opacity:0; }
 }
 
-/*
-  Unfortunately each browser vendor requires
-  its own definition of keyframe animation code...
-*/
-@-webkit-keyframes my_animation {
-  from { opacity:1; }
-  to { opacity:0; }
-}
-
-@-moz-keyframes my_animation {
-  from { opacity:1; }
-  to { opacity:0; }
-}
-
-@-o-keyframes my_animation {
-  from { opacity:1; }
-  to { opacity:0; }
-}
 ```
 
 The same approach to animation can be used using JavaScript code (**jQuery is used within to perform animations**):
@@ -206,7 +188,7 @@ able to capture class changes if an **expression** or the **ng-class** directive
 
 The example below shows how to perform animations during class changes:
 
-<example module="ngAnimate" deps="angular-animate.js" animations="true">
+<example module="ngAnimate" deps="angular-animate.js" animations="true" name="animate-css-class">
  <file name="index.html">
   <p>
     <input type="button" value="set" ng-click="myCssVar='css-class'">
@@ -217,10 +199,7 @@ The example below shows how to perform animations during class changes:
  </file>
  <file name="style.css">
    .css-class-add, .css-class-remove {
-     -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-     -moz-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-     -o-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-     transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+     transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
    }
 
    .css-class,
@@ -231,7 +210,7 @@ The example below shows how to perform animations during class changes:
 
    .css-class-remove.css-class-remove-active {
      font-size:1.0em;
-     color:black;
+     color: black;
    }
  </file>
 </example>
@@ -317,8 +296,8 @@ app.config(function($animateProvider) {
 ```css
 /&#42; prefixed with animate- &#42;/
 .animate-fade-add.animate-fade-add-active {
-  transition:1s linear all;
-  opacity:0;
+  transition: all 1s linear;
+  opacity: 0;
 }
 ```
 
@@ -334,8 +313,8 @@ 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
+When the first argument is a native DOM or jqLite/jQuery element, the function enables / disables
+animations on this element *and all its children*: `$animate.enabled(myElement, false)`. 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.
@@ -368,6 +347,7 @@ By setting `transition: 0s`, ngAnimate will ignore the existing transition style
 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
@@ -442,8 +422,25 @@ 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}.
 
+
+### Enable animations for elements outside of the Angular application DOM tree: {@link ng.$animate#pin $animate.pin()}
+
+Before animating, `ngAnimate` checks to see if the element being animated is inside the application DOM tree,
+and if it is not, no animation is run. Usually, this is not a problem as most apps use the `ngApp`
+attribute / bootstrap the app on the `html` or `body` element.
+
+Problems arise when the application is bootstrapped on a different element, and animations are
+attempted on elements that are outside the application tree, e.g. when libraries append popup and modal
+elements as the last child in the body tag.
+
+You can use {@link ng.$animate#pin `$animate.pin(elementToAnimate, parentHost)`} to specify that an
+element belongs to your application. Simply call it before the element is added to the DOM / before
+the animation starts, with the element you want to animate, and the element which should be its
+assumed parent.
+
+
 ## More about animations
 
 For a full breakdown of each method available on `$animate`, see the {@link ng.$animate API documentation}.
 
-To see a complete demo, see the {@link tutorial/step_12 animation step within the AngularJS phonecat tutorial}.
+To see a complete demo, see the {@link tutorial/step_14 animation step within the AngularJS phonecat tutorial}.

docs/content/guide/compiler.ngdoc

@@ -77,7 +77,7 @@ to write directives.
 Here is a directive which makes any element draggable. Notice the `draggable` attribute on the
 `<span>` element.
 
-<example module="drag">
+<example module="drag" name="draggable">
   <file name="script.js">
     angular.module('drag', []).
       directive('draggable', function($document) {

docs/content/guide/component-router.ngdoc

@@ -5,6 +5,11 @@
 
 # Component Router
 
+<div class="alert alert-info">
+**Deprecation Notice:** In an effort to keep synchronized with router changes in Angular 2, this implementation of the Component Router (ngComponentRouter module) has been deprecated and will not receive further updates.
+We are investigating backporting the Angular 2 Router to Angular 1, but alternatively, use the {@link ngRoute} module or community developed projects (e.g. [ui-router](https://github.com/angular-ui/ui-router)).
+</div>
+
 This guide describes the new Component Router for AngularJS 1.5.
 
 <div class="alert alert-info">
@@ -225,8 +230,8 @@ You can see the complete application running below.
 
       this.getHero = function(id) {
         return heroesPromise.then(function(heroes) {
-          for(var i=0; i<heroes.length; i++) {
-            if ( heroes[i].id == id) return heroes[i];
+          for (var i = 0; i < heroes.length; i++) {
+            if (heroes[i].id === id) return heroes[i];
           }
         });
       };
@@ -245,7 +250,7 @@ You can see the complete application running below.
       };
 
       this.isSelected = function(hero) {
-        return (hero.id == selectedId);
+        return (hero.id === selectedId);
       };
     }
 
@@ -316,8 +321,8 @@ You can see the complete application running below.
 
       this.getCrisis = function(id) {
         return crisesPromise.then(function(crises) {
-          for(var i=0; i<crises.length; i++) {
-            if ( crises[i].id == id) return crises[i];
+          for (var i = 0; i < crises.length; i++) {
+            if (crises[i].id === id) return crises[i];
           }
         });
       };
@@ -337,7 +342,7 @@ You can see the complete application running below.
       };
 
       this.isSelected = function(crisis) {
-        return (crisis.id == selectedId);
+        return (crisis.id === selectedId);
       };
 
       this.onSelect = function(crisis) {
@@ -467,8 +472,8 @@ AngularJS itself via npm:
 
 ```bash
 npm init
-npm install@1.5.x angular --save
-npm install @angular/router --save
+npm install angular@1.5.x --save
+npm install @angular/router@0.2.0 --save
 ```
 
 
@@ -482,6 +487,14 @@ Just like any Angular application, we load the JavaScript files into our `index.
   <script src="/app/app.js"></script>
 ```
 
+You also need to include ES6 shims for browsers that do not support ES6 code (Internet Explorer,
+ iOs < 8, Android < 5.0, Windows Mobile < 10):
+ ```html
+ <!-- IE required polyfills, in this exact order -->
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.33.3/es6-shim.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
+ <script src="https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+ ```
 
 ## Create the `app` module
 
@@ -658,7 +671,7 @@ because the `HeroList` and `HeroDetail` will not contain any child routes.
 
 The `component` property in a **Route Definition** defines the **Component** directive that will be rendered
 into the DOM via the **Outlet**. For example the `heroDetail` **Component** will be rendered into the page
-where the `<ng-outlet></ng-outlet>` lives as `<hero-detail></hero-detail>.
+where the `<ng-outlet></ng-outlet>` lives as `<hero-detail></hero-detail>`.
 
 The `name` property is used to reference the **Route Definition** when generating URLs or navigating to
 **Routes**. For example this link will `<a ng-link="['Heroes']">Heroes</a>` navigate the **Route Definition**
@@ -712,8 +725,8 @@ function HeroService($q) {
 
   this.getHero = function(id) {
     return heroesPromise.then(function(heroes) {
-      for(var i=0; i<heroes.length; i++) {
-        if ( heroes[i].id == id) return heroes[i];
+      for (var i = 0; i < heroes.length; i++) {
+        if (heroes[i].id === id) return heroes[i];
       }
     });
   };
@@ -854,7 +867,6 @@ Router itself, which was made available by the binding in the **Component Defini
 function HeroDetailComponent(heroService) {
   ...
   this.gotoHeroes = function() {
-    var heroId = this.hero && this.hero.id;
     this.$router.navigate(['HeroList']);
   };
 ```
@@ -912,7 +924,7 @@ function HeroListComponent(heroService) {
   };
 
   this.isSelected = function(hero) {
-    return (hero.id == selectedId);
+    return (hero.id === selectedId);
   };
 }
 ```

docs/content/guide/component.ngdoc

@@ -33,7 +33,7 @@ Components can be registered using the `.component()` method of an Angular modul
 
 <example name="heroComponentSimple" module="heroApp">
 <file name="index.js">
-  angular.module('heroApp', []).controller('mainCtrl', function() {
+  angular.module('heroApp', []).controller('MainCtrl', function MainCtrl() {
     this.hero = {
       name: 'Spawn'
     };
@@ -55,7 +55,7 @@ Components can be registered using the `.component()` method of an Angular modul
 </file>
 <file name="index.html">
   <!-- components match only elements -->
-  <div ng-controller="mainCtrl as ctrl">
+  <div ng-controller="MainCtrl as ctrl">
     <b>Hero</b><br>
     <hero-detail hero="ctrl.hero"></hero-detail>
   </div>
@@ -133,7 +133,7 @@ components should follow a few simple conventions:
     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 -->
+        <!-- note that we use kebab-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>
     ```
@@ -160,6 +160,12 @@ of the component. The following hook methods can be implemented:
     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.
+  * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
+    changes. Any actions that you wish to take in response to the changes that you detect must be
+    invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
+    could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
+    be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
+    if detecting changes, you must store the previous value(s) for comparison to the current values.
   * `$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
@@ -194,7 +200,7 @@ 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', []);
+  angular.module('heroApp', []);
 </file>
 
 <file name="heroList.js">
@@ -233,9 +239,13 @@ it upwards to the heroList component, which updates the original data.
 </file>
 
 <file name="heroDetail.js">
-  function HeroDetailController($scope, $element, $attrs) {
+  function HeroDetailController() {
     var ctrl = this;
 
+    ctrl.delete = function() {
+      ctrl.onDelete({hero: ctrl.hero});
+    };
+
     ctrl.update = function(prop, value) {
       ctrl.onUpdate({hero: ctrl.hero, prop: prop, value: value});
     };
@@ -303,7 +313,7 @@ it upwards to the heroList component, which updates the original data.
   <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>
+    <button ng-click="$ctrl.delete()">Delete</button>
   </div>
 </file>
 <file name="editableField.html">
@@ -373,12 +383,12 @@ but they are guaranteed to be available just before the `$onInit` method is exec
 
 Here is a tab pane example built from components:
 
-<example module="docsTabsExample">
+<example module="docsTabsExample" name="component-tabs-pane">
   <file name="script.js">
 angular.module('docsTabsExample', [])
   .component('myTabs', {
     transclude: true,
-    controller: function() {
+    controller: function MyTabsController() {
       var panes = this.panes = [];
       this.select = function(pane) {
         angular.forEach(panes, function(pane) {
@@ -443,54 +453,52 @@ angular.module('docsTabsExample', [])
 
 # 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 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;
+  var $componentController;
 
-  beforeEach(module('simpleComponent'));
-
-  beforeEach(inject(function($rootScope, _$componentController_) {
-    scope = $rootScope.$new();
+  beforeEach(module('heroApp'));
+  beforeEach(inject(function(_$componentController_) {
     $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() {
+  it('should expose a `hero` object', function() {
     // Here we are passing actual bindings to the component
+    var bindings = {hero: {name: 'Wolverine'}};
+    var ctrl = $componentController('heroDetail', null, bindings);
 
-    component = $componentController('heroDetail',
-      {$scope: scope},
-      {hero: hero}
-    );
-    expect(component.hero.name).toBe('Wolverine');
+    expect(ctrl.hero).toBeDefined();
+    expect(ctrl.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')}
-    );
+  it('should call the `onDelete` binding, when deleting the hero', function() {
+    var onDeleteSpy = jasmine.createSpy('onDelete');
+    var bindings = {hero: {}, onDelete: onDeleteSpy};
+    var ctrl = $componentController('heroDetail', null, bindings);
 
-    component.onDelete({hero: component.hero});
-    expect(spy('deleteSpy')).toHaveBeenCalledWith(component.hero);
+    ctrl.delete();
+    expect(onDeleteSpy).toHaveBeenCalledWith({hero: ctrl.hero});
+  });
+
+  it('should call the `onUpdate` binding, when updating a property', function() {
+    var onUpdateSpy = jasmine.createSpy('onUpdate');
+    var bindings = {hero: {}, onUpdate: onUpdateSpy};
+    var ctrl = $componentController('heroDetail', null, bindings);
+
+    ctrl.update('foo', 'bar');
+    expect(onUpdateSpy).toHaveBeenCalledWith({
+      hero: ctrl.hero,
+      prop: 'foo',
+      value: 'bar'
+    });
   });
 
 });

docs/content/guide/concepts.ngdoc

@@ -103,7 +103,7 @@ different currencies and also pay the invoice.
 <example name="guide-concepts-2" ng-app-included="true" >
   <file name="invoice1.js">
     angular.module('invoice1', [])
-      .controller('InvoiceController', function() {
+      .controller('InvoiceController', function InvoiceController() {
         this.qty = 1;
         this.cost = 2;
         this.inCurr = 'EUR';
@@ -121,7 +121,7 @@ different currencies and also pay the invoice.
           return amount * this.usdToForeignRates[outCurr] / this.usdToForeignRates[inCurr];
         };
         this.pay = function pay() {
-          window.alert("Thanks!");
+          window.alert('Thanks!');
         };
       });
   </file>
@@ -151,8 +151,9 @@ different currencies and also pay the invoice.
 What changed?
 
 First, there is a new JavaScript file that contains a <a name="controller">{@link controller controller}</a>.
-More exactly, the file contains a constructor function that creates the actual controller instance.
-The purpose of controllers is to expose variables and functionality to expressions and directives.
+More accurately, the file specifies a constructor function that will be used to create the actual
+controller instance. The purpose of controllers is to expose variables and functionality to
+expressions and directives.
 
 Besides the new file that contains the controller code we also added an
 {@link ng.directive:ngController `ng-controller`} directive to the HTML.
@@ -199,7 +200,7 @@ Let's refactor our example and move the currency conversion into a service in an
           EUR: 0.74,
           CNY: 6.09
         };
-        var convert = function (amount, inCurr, outCurr) {
+        var convert = function(amount, inCurr, outCurr) {
           return amount * usdToForeignRates[outCurr] / usdToForeignRates[inCurr];
         };
 
@@ -211,7 +212,7 @@ Let's refactor our example and move the currency conversion into a service in an
   </file>
   <file name="invoice2.js">
     angular.module('invoice2', ['finance2'])
-      .controller('InvoiceController', ['currencyConverter', function(currencyConverter) {
+      .controller('InvoiceController', ['currencyConverter', function InvoiceController(currencyConverter) {
         this.qty = 1;
         this.cost = 2;
         this.inCurr = 'EUR';
@@ -221,7 +222,7 @@ Let's refactor our example and move the currency conversion into a service in an
           return currencyConverter.convert(this.qty * this.cost, this.inCurr, outCurr);
         };
         this.pay = function pay() {
-          window.alert("Thanks!");
+          window.alert('Thanks!');
         };
       }]);
   </file>
@@ -251,6 +252,7 @@ Let's refactor our example and move the currency conversion into a service in an
 <img class="pull-right" style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-module-service.png">
 
 What changed?
+
 We moved the `convertCurrency` function and the definition of the existing currencies
 into the new file `finance2.js`. But how does the controller
 get a hold of the now separated function?
@@ -274,11 +276,12 @@ The code snippet `angular.module('invoice2', ['finance2'])`  specifies that the
 `finance2` module. By this, Angular uses the `InvoiceController` as well as the `currencyConverter` service.
 
 Now that Angular knows of all the parts of the application, it needs to create them.
-In the previous section we saw that controllers are created using a factory function.
-For services there are multiple ways to define their factory
+In the previous section we saw that controllers are created using a constructor function.
+For services, there are multiple ways to specify how they are created
 (see the {@link services service guide}).
-In the example above, we are using a function that returns the `currencyConverter` function as the factory
-for the service.
+In the example above, we are using an anonymous function as the factory function for the
+`currencyConverter` service.
+This function should return the `currencyConverter` service instance.
 
 Back to the initial question: How does the `InvoiceController` get a reference to the `currencyConverter` function?
 In Angular, this is done by simply defining arguments on the constructor function. With this, the injector
@@ -303,7 +306,7 @@ The following example shows how this is done with Angular:
 <example name="guide-concepts-3" ng-app-included="true">
   <file name="invoice3.js">
     angular.module('invoice3', ['finance3'])
-      .controller('InvoiceController', ['currencyConverter', function(currencyConverter) {
+      .controller('InvoiceController', ['currencyConverter', function InvoiceController(currencyConverter) {
         this.qty = 1;
         this.cost = 2;
         this.inCurr = 'EUR';
@@ -313,7 +316,7 @@ The following example shows how this is done with Angular:
           return currencyConverter.convert(this.qty * this.cost, this.inCurr, outCurr);
         };
         this.pay = function pay() {
-          window.alert("Thanks!");
+          window.alert('Thanks!');
         };
       }]);
   </file>
@@ -321,13 +324,13 @@ The following example shows how this is done with Angular:
     angular.module('finance3', [])
       .factory('currencyConverter', ['$http', function($http) {
         var YAHOO_FINANCE_URL_PATTERN =
-              '//query.yahooapis.com/v1/public/yql?q=select * from '+
-              'yahoo.finance.xchange where pair in ("PAIRS")&format=json&'+
+              '//query.yahooapis.com/v1/public/yql?q=select * from ' +
+              'yahoo.finance.xchange where pair in ("PAIRS")&format=json&' +
               'env=store://datatables.org/alltableswithkeys&callback=JSON_CALLBACK';
         var currencies = ['USD', 'EUR', 'CNY'];
         var usdToForeignRates = {};
 
-        var convert = function (amount, inCurr, outCurr) {
+        var convert = function(amount, inCurr, outCurr) {
           return amount * usdToForeignRates[outCurr] / usdToForeignRates[inCurr];
         };
 

docs/content/guide/controller.ngdoc

@@ -132,7 +132,7 @@ The message in our template contains a binding to the `spice` model which, by de
 string "very". Depending on which button is clicked, the `spice` model is set to `chili` or
 `jalapeño`, and the message is automatically updated by data-binding.
 
-<example module="spicyApp1">
+<example module="spicyApp1" name="controller-spicy-1">
   <file name="index.html">
     <div ng-controller="SpicyController">
      <button ng-click="chiliSpicy()">Chili</button>
@@ -173,7 +173,7 @@ its children).
 Controller methods can also take arguments, as demonstrated in the following variation of the
 previous example.
 
-<example module="spicyApp2">
+<example module="spicyApp2" name="controller-spicy-2">
   <file name="index.html">
   <div ng-controller="SpicyController">
    <input ng-model="customSpice">
@@ -186,7 +186,7 @@ previous example.
     var myApp = angular.module('spicyApp2', []);
 
     myApp.controller('SpicyController', ['$scope', function($scope) {
-        $scope.customSpice = "wasabi";
+        $scope.customSpice = 'wasabi';
         $scope.spice = 'very';
 
         $scope.spicy = function(spice) {
@@ -210,7 +210,7 @@ have access to properties and methods defined by Controllers higher up the hiera
 See [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes) for
 more information about scope inheritance.
 
-<example module="scopeInheritance">
+<example module="scopeInheritance" name="controller-scope-inheritance">
   <file name="index.html">
     <div class="spicy">
       <div ng-controller="MainController">

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(exp) {
+                return exp && $parse(exp);
+              });
+
+              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>