docs(changelog): release notes for 1.2.25

docs(changelog): release notes for 1.3.0-rc.2
fix(ngLocale): Regenerate Locale Files
2014-09-16 15:05:22 -07:00 · 2014-09-16 15:05:06 -07:00 · 2014-09-16 17:18:52 -04:00 · 2014-09-16 17:18:22 -04:00 · 2014-09-16 12:46:53 -07:00 · 2014-09-15 20:40:02 +01:00
1122 changed files with 18664 additions and 46460 deletions
@@ -10,6 +10,9 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

+[src/ngLocale/**]
+insert_final_newline = false
+
 [dropdown-toggle.js]
 trim_trailing_whitespace = false
 insert_final_newline = false
@@ -1,5 +1,4 @@
 /build/
-/benchpress-build/
 .DS_Store
 gen_docs.disable
 test.disable
@@ -13,9 +12,7 @@ angular.js.tmproj
 bower_components/
 angular.xcodeproj
 .idea
-*.iml
 .agignore
-.lvimrc
 libpeerconnection.log
 npm-debug.log
 /tmp/
@@ -1,41 +1,6 @@
 {
-  "excludeFiles": ["src/ngLocale/**"],
  "disallowKeywords": ["with"],
-  "disallowMixedSpacesAndTabs": true,
-  "disallowMultipleLineStrings": true,
-  "disallowNewlineBeforeBlockStatements": true,
-  "disallowSpaceAfterObjectKeys": true,
-  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
-  "disallowSpaceBeforeBinaryOperators": [","],
-  "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
-  "disallowSpacesInAnonymousFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInFunctionDeclaration": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInNamedFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInsideArrayBrackets": true,
-  "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
-  },
-  "requireSpacesInFunction": {
-    "beforeOpeningCurlyBrace": true
-  },
-  "validateLineBreaks": "LF",
-  "validateParameterSeparator": ", "
+  "requireRightStickedOperators": ["!"],
+  "requireLeftStickedOperators": [","]
 }
@@ -5,9 +5,13 @@

 {
  "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
+  "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
+  "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+  "disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
  "disallowImplicitTypeConversion": ["string"],
  "disallowMultipleLineBreaks": true,
  "disallowKeywordsOnNewLine": ["else"],
+  "requireLineFeedAtFileEnd": true,
  "validateJSDoc": {
    "checkParamNames": true,
    "requireParamTypes": true
@@ -8,19 +8,15 @@ branches:

 env:
  matrix:
-    - JOB=unit BROWSER_PROVIDER=saucelabs
-    - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
-    - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
-    - JOB=unit BROWSER_PROVIDER=browserstack
-    - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack
-    - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=browserstack
+    - JOB=unit
+    - JOB=e2e TEST_TARGET=jqlite
+    - JOB=e2e TEST_TARGET=jquery
+    - JOB=e2e TEST_TARGET=doce2e
  global:
    - SAUCE_USERNAME=angular-ci
    - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
-    - BROWSER_STACK_USERNAME=VojtaJina
-    - BROWSER_STACK_ACCESS_KEY=QCQJ1ZpWXpBkSwEdD8ev
    - LOGS_DIR=/tmp/angular-build/logs
-    - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
+    - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready

 install:
  # - npm config set registry http://23.251.144.68
@@ -33,7 +29,7 @@ install:

 before_script:
  - mkdir -p $LOGS_DIR
-  - ./scripts/travis/start_browser_provider.sh
+  - ./lib/sauce/sauce_connect_setup.sh
  - npm install -g grunt-cli
  - grunt package
  - ./scripts/travis/wait_for_browser_provider.sh
@@ -40,13 +40,12 @@ would like to implement a new feature then consider what kind of change it is:
 [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.
+* **Small Changes** can be crafted and submitted to [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).
+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.

@@ -54,7 +53,7 @@ For large fixes, please build and test the documentation before submitting the P
 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.

-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.

 ## <a name="submit"></a> Submission Guidelines

@@ -66,13 +65,13 @@ 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
+* **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?
-* **Reproduce the Error** - provide a live example (using [Plunker][plunker] or
+* **Reproduce the error** - provide a live example (using [Plunker][plunker] or
  [JSFiddle][jsfiddle]) or a unambiguous set of steps.
-* **Related Issues** - has a similar issue been reported before?
+* **Related issues** - has a similar issue been reported before?
 * **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
  causing the problem (line of code or commit)

@@ -85,7 +84,7 @@ Before you submit your pull request consider the following guidelines:

 * Search [GitHub](https://github.com/angular/angular.js/pulls) for an open or closed Pull Request
  that relates to your submission. You don't want to duplicate effort.
-* Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull
+* Please sign our [Contributor License Agreement (CLA)](#signing-the-cla) before sending pull
  requests. We cannot accept code without this.
 * Make your changes in a new git branch

@@ -94,7 +93,7 @@ Before you submit your pull request consider the following guidelines:
     ```

 * Create your patch, **including appropriate test cases**.
-* Follow our [Coding Rules](#rules).
+* Follow our [Coding Rules](#coding-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
@@ -127,7 +126,7 @@ Before you submit your pull request consider the following guidelines:

    ```shell
    git rebase master -i
-    git push origin my-fix-branch -f
+    git push -f
    ```

 That's it! Thank you for your contribution!
@@ -173,7 +172,7 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
    * **Do not use namespaces**: Instead,  wrap the entire angular code base in an anonymous closure and
      export our API explicitly rather than implicitly.
    * Wrap all code at **100 characters**.
-    * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypal
+    * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypical
      inheritance only when absolutely necessary.
    * We **love functions and closures** and, whenever possible, prefer them over objects.
    * To write concise code that can be better minified, we **use aliases internally** that map to the
@@ -260,7 +259,6 @@ You can find out more detailed information about contributing in the
 [contribute]: http://docs.angularjs.org/misc/contribute
 [contributing]: http://docs.angularjs.org/misc/contribute
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
-[dev-doc]: https://docs.angularjs.org/guide
 [github]: https://github.com/angular/angular.js
 [groups]: https://groups.google.com/forum/?fromgroups#!forum/angular
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
@@ -4,14 +4,12 @@ var files = require('./angularFiles').files;
 var util = require('./lib/grunt/utils.js');
 var versionInfo = require('./lib/versions/version-info');
 var path = require('path');
-var e2e = require('./test/e2e/tools');

 module.exports = function(grunt) {
  //grunt plugins
  require('load-grunt-tasks')(grunt);

  grunt.loadTasks('lib/grunt');
-  grunt.loadNpmTasks('angular-benchpress');

  var NG_VERSION = versionInfo.currentVersion;
  NG_VERSION.cdn = versionInfo.cdnVersion;
@@ -24,10 +22,13 @@ module.exports = function(grunt) {
  //config
  grunt.initConfig({
    NG_VERSION: NG_VERSION,
-    bp_build: {
-      options: {
-        buildPath: 'build/benchmarks',
-        benchmarksPath: 'benchmarks'
+
+    parallel: {
+      travis: {
+        tasks: [
+          util.parallelTask(['test:unit', 'test:promises-aplus', 'tests:docs'], {stream: true}),
+          util.parallelTask(['test:e2e'])
+        ]
      }
    },

@@ -39,14 +40,13 @@ module.exports = function(grunt) {
          base: '.',
          keepalive: true,
          middleware: function(connect, options){
-            var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
            return [
-              util.conditionalCsp(),
+              //uncomment to enable CSP
+              // util.csp(),
              util.rewrite(),
-              e2e.middleware(),
              connect.favicon('images/favicon.ico'),
-              connect.static(base),
-              connect.directory(base)
+              connect.static(options.base),
+              connect.directory(options.base)
            ];
          }
        }
@@ -59,7 +59,6 @@ module.exports = function(grunt) {
          port: 8000,
          hostname: '0.0.0.0',
          middleware: function(connect, options){
-            var base = Array.isArray(options.base) ? options.base[options.base.length - 1] : options.base;
            return [
              function(req, resp, next) {
                // cache get requests to speed up tests on travis
@@ -69,10 +68,8 @@ module.exports = function(grunt) {

                next();
              },
-              util.conditionalCsp(),
-              e2e.middleware(),
              connect.favicon('images/favicon.ico'),
-              connect.static(base)
+              connect.static(options.base)
            ];
          }
        }
@@ -130,9 +127,6 @@ module.exports = function(grunt) {
      ngLocale: {
        files: { src: 'src/ngLocale/**/*.js' },
      },
-      ngMessages: {
-        files: { src: 'src/ngMessages/**/*.js' },
-      },
      ngMock: {
        files: { src: 'src/ngMock/**/*.js' },
      },
@@ -150,9 +144,6 @@ module.exports = function(grunt) {
      },
      ngTouch: {
        files: { src: 'src/ngTouch/**/*.js' },
-      },
-      ngAria: {
-        files: {src: 'src/ngAria/**/*.js'},
      }
    },

@@ -167,7 +158,7 @@ module.exports = function(grunt) {
      scenario: {
        dest: 'build/angular-scenario.js',
        src: [
-          'bower_components/jquery/dist/jquery.js',
+          'bower_components/jquery/jquery.js',
          util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular')
        ],
        styles: {
@@ -204,10 +195,6 @@ module.exports = function(grunt) {
        dest: 'build/angular-resource.js',
        src: util.wrap(files['angularModules']['ngResource'], 'module')
      },
-      messages: {
-        dest: 'build/angular-messages.js',
-        src: util.wrap(files['angularModules']['ngMessages'], 'module')
-      },
      animate: {
        dest: 'build/angular-animate.js',
        src: util.wrap(files['angularModules']['ngAnimate'], 'module')
@@ -220,10 +207,6 @@ module.exports = function(grunt) {
        dest: 'build/angular-cookies.js',
        src: util.wrap(files['angularModules']['ngCookies'], 'module')
      },
-      aria: {
-        dest: 'build/angular-aria.js',
-        src: util.wrap(files['angularModules']['ngAria'], 'module')
-      },
      "promises-aplus-adapter": {
        dest:'tmp/promises-aplus-adapter++.js',
        src:['src/ng/q.js','lib/promises-aplus/promises-aplus-test-adapter.js']
@@ -236,12 +219,10 @@ module.exports = function(grunt) {
      animate: 'build/angular-animate.js',
      cookies: 'build/angular-cookies.js',
      loader: 'build/angular-loader.js',
-      messages: 'build/angular-messages.js',
      touch: 'build/angular-touch.js',
      resource: 'build/angular-resource.js',
      route: 'build/angular-route.js',
-      sanitize: 'build/angular-sanitize.js',
-      aria: 'build/angular-aria.js'
+      sanitize: 'build/angular-sanitize.js'
    },


@@ -250,7 +231,7 @@ module.exports = function(grunt) {
        'src/**/*.js',
        'test/**/*.js',
        '!test/ngScenario/DescribeSpec.js',
-        '!src/ng/directive/attrs.js', // legitimate xit here
+        '!src/ng/directive/booleanAttrs.js', // legitimate xit here
        '!src/ngScenario/**/*.js'
      ]
    },
@@ -284,14 +265,14 @@ module.exports = function(grunt) {
      }
    },

-    shell: {
-      "promises-aplus-tests": {
-        options: {
-          stdout: false,
-          stderr: true,
-          failOnError: true
+    shell:{
+      "promises-aplus-tests":{
+        options:{
+          //stdout:true,
+          stderr:true,
+          failOnError:true
        },
-        command: path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js')
+        command:path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js')
      }
    },

@@ -6,11 +6,10 @@ use good old HTML (or HAML, Jade and friends!) as your template language and let
 syntax to express your application’s components clearly and succinctly.  It automatically
 synchronizes data from your UI (view) with your JavaScript objects (model) through 2-way data
 binding. To help you structure your application better and make it easy to test, AngularJS teaches
-the browser how to do dependency injection and inversion of control.
-
-Oh yeah and it helps with server-side communication, taming async callbacks with promises and 
-deferreds. It also makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
-piece of cake. The best of all: it makes development fun!
+the browser how to do dependency injection and inversion of control. Oh yeah and it also helps with
+server-side communication, taming async callbacks with promises and deferreds; and makes client-side
+navigation and deeplinking with hashbang urls or HTML5 pushState a piece of cake. The best of all:
+it makes development fun!

 * Web site: http://angularjs.org
 * Tutorial: http://docs.angularjs.org/tutorial
@@ -26,6 +26,7 @@ This process based on the idea of minimizing user pain
    * You can triage older issues as well
    * Triage to your heart's content
 1. Assign yourself: Pick an issue that is not assigned to anyone and assign it to you
+
 1. Understandable? - verify if the description of the request is clear.
    * If not, [close it][] according to the instructions below and go to the last step.
 1. Duplicate?
@@ -35,6 +36,7 @@ This process based on the idea of minimizing user pain
    * Label `Type: Bug`
    * Reproducible? - Steps to reproduce the bug are clear. If they are not, ask for a clarification. If there's no reply after a week, [close it][].
    * Reproducible on master? - <http://code.angularjs.org/snapshot/>
+
 1. Non bugs:
    * Label `Type: Feature`, `Type: Chore`, or `Type: Perf`
    * Belongs in core? – Often new features should be implemented as a third-party module rather than an addition to the core.
@@ -57,6 +59,7 @@ This process based on the idea of minimizing user pain
    * In rare cases, it's ok to have multiple components.
 1. Label `PRs plz!` - These issues are good targets for PRs from the open source community. Apply to issues where the problem and solution are well defined in the comments, and it's not too complex.
 1. Label `origin: google` for issues from Google
+
 1. Assign a milestone:
   * Backlog - triaged fixes and features, should be the default choice
   * Current 1.x.y milestone (e.g. 1.3.0-beta-2) - regressions and urgent bugs only
@@ -5,7 +5,6 @@ var angularFiles = {
    'src/minErr.js',
    'src/Angular.js',
    'src/loader.js',
-    'src/stringify.js',
    'src/AngularPublic.js',
    'src/jqLite.js',
    'src/apis.js',
@@ -35,8 +34,6 @@ var angularFiles = {
    'src/ng/sanitizeUri.js',
    'src/ng/sce.js',
    'src/ng/sniffer.js',
-    'src/ng/templateRequest.js',
-    'src/ng/testability.js',
    'src/ng/timeout.js',
    'src/ng/urlUtils.js',
    'src/ng/window.js',
@@ -49,7 +46,7 @@ var angularFiles = {

    'src/ng/directive/directives.js',
    'src/ng/directive/a.js',
-    'src/ng/directive/attrs.js',
+    'src/ng/directive/booleanAttrs.js',
    'src/ng/directive/form.js',
    'src/ng/directive/input.js',
    'src/ng/directive/ngBind.js',
@@ -74,7 +71,6 @@ var angularFiles = {
  ],

  'angularLoader': [
-    'stringify.js',
    'src/minErr.js',
    'src/loader.js'
  ],
@@ -86,9 +82,6 @@ var angularFiles = {
    'ngCookies': [
      'src/ngCookies/cookies.js'
    ],
-    'ngMessages': [
-      'src/ngMessages/messages.js'
-    ],
    'ngResource': [
      'src/ngResource/resource.js'
    ],
@@ -110,9 +103,6 @@ var angularFiles = {
      'src/ngTouch/directive/ngClick.js',
      'src/ngTouch/directive/ngSwipe.js'
    ],
-    'ngAria': [
-      'src/ngAria/aria.js'
-    ]
  },

  'angularScenario': [
@@ -140,18 +130,16 @@ var angularFiles = {
    'test/auto/*.js',
    'test/ng/**/*.js',
    'test/ngAnimate/*.js',
-    'test/ngMessages/*.js',
    'test/ngCookies/*.js',
    'test/ngResource/*.js',
    'test/ngRoute/**/*.js',
    'test/ngSanitize/**/*.js',
    'test/ngMock/*.js',
-    'test/ngTouch/**/*.js',
-    'test/ngAria/*.js'
+    'test/ngTouch/**/*.js'
  ],

  'karma': [
-    'bower_components/jquery/dist/jquery.js',
+    'bower_components/jquery/jquery.js',
    'test/jquery_remove.js',
    '@angularSrc',
    'src/publishExternalApis.js',
@@ -181,12 +169,11 @@ var angularFiles = {
    'test/ngRoute/**/*.js',
    'test/ngResource/*.js',
    'test/ngSanitize/**/*.js',
-    'test/ngTouch/**/*.js',
-    'test/ngAria/*.js'
+    'test/ngTouch/**/*.js'
  ],

  'karmaJquery': [
-    'bower_components/jquery/dist/jquery.js',
+    'bower_components/jquery/jquery.js',
    'test/jquery_alias.js',
    '@angularSrc',
    'src/publishExternalApis.js',
@@ -204,14 +191,12 @@ var angularFiles = {

 angularFiles['angularSrcModules'] = [].concat(
  angularFiles['angularModules']['ngAnimate'],
-  angularFiles['angularModules']['ngMessages'],
  angularFiles['angularModules']['ngCookies'],
  angularFiles['angularModules']['ngResource'],
  angularFiles['angularModules']['ngRoute'],
  angularFiles['angularModules']['ngSanitize'],
  angularFiles['angularModules']['ngMock'],
-  angularFiles['angularModules']['ngTouch'],
-  angularFiles['angularModules']['ngAria']
+  angularFiles['angularModules']['ngTouch']
 );

 if (exports) {
@@ -1,6 +0,0 @@
-Instructions for using benchpress (how to create benchmarks, how to run, how to configure) can be
-found at: https://github.com/angular/benchpress/blob/master/README.md.
-
-In this project, there is a configured grunt task for building the benchmarks,
-`grunt bp_build`, which places the runnable benchmarks in "/build/benchmarks/".
-The existing `grunt webserver` task can be used to serve the built benchmarks at `localhost:8000/build/benchmarks/<benchmark-name>`
@@ -1,57 +0,0 @@
-var app = angular.module('eventDelegationBenchmark', []);
-
-app.directive('noopDir', function() {
-  return {
-    compile: function($element, $attrs) {
-      return function($scope, $element) {
-        return 1;
-      }
-    }
-  };
-});
-
-app.directive('nativeClick', ['$parse', function($parse) {
-  return {
-    compile: function($element, $attrs) {
-      var expr = $parse($attrs.tstEvent);
-      return function($scope, $element) {
-        $element[0].addEventListener('click', function() {
-          console.log('clicked');
-        }, false);
-      }
-    }
-  };
-}]);
-
-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) {
-  this.ngRepeatCount = 1000;
-  this.rows = [];
-  var self = this;
-
-  benchmarkSteps.push({
-    name: '$apply',
-    fn: function() {
-      var oldRows = self.rows;
-      $rootScope.$apply(function() {
-        self.rows = [];
-      });
-      self.rows = oldRows;
-      if (self.rows.length !== self.ngRepeatCount) {
-        self.rows = [];
-        for (var i=0; i<self.ngRepeatCount; i++) {
-          self.rows.push('row'+i);
-        }
-      }
-      $rootScope.$apply();
-    }
-  });
-});
@@ -1,10 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [{
-      id: 'angular',
-      src: '/build/angular.js'
-    },{
-      src: 'app.js',
-    }]
-  });
-};
@@ -1,139 +0,0 @@
-<div ng-app="eventDelegationBenchmark">
-<div ng-controller="DataController as ctrl">
-<div class="container-fluid">
-
-<p>
-Impact of event delegation.
-</p>
-
-<p>
-<label>
-  Number of ngRepeats:
-  <input type="number" ng-model="ctrl.ngRepeatCount">
-</label>
-</p>
-
-<p>
-<div class="radio"><label><input type=radio ng-model="benchmarkType" value="ngClick">ngClick</label></div>
-<div class="radio"><label><input type=radio ng-model="benchmarkType" value="ngClickNoJqLite">ngClick without jqLite</label></div>
-<div class="radio"><label><input type=radio ng-model="benchmarkType" value="ngShow">baseline: ng-show</label></div>
-<div class="radio"><label><input type=radio ng-model="benchmarkType" value="textInterpolation">baseline: text interpolation</label></div>
-<div class="radio"><label><input type=radio ng-model="benchmarkType" value="dlgtClick">delegate event directive (only compile)</label></div>
-<div class="radio"><label><input type=radio ng-model="benchmarkType" value="noopDir">baseline: noop directive (compile and link)</label></div>
-<div class="radio"><label><input type=radio ng-model="benchmarkType" value="noop">baseline: no directive</label></div>
-</p>
-
-<p>
-How to read the results:
-<ul>
-  <li>The benchmark measures how long it takes to instantiate a given number of directives</li>
-  <li>ngClick is compared against ngShow and text interpolation as baseline. The results show
-      how expensive ngClick is compared to other very simple directives that touch the DOM.
-  </li>
-  <li>To measure the impact of jqLite.on vs element.addEventListener there is also a benchmark
-      that as a modified version of ngClick that uses element.addEventListener.
-  </li>
-  <li>The delegate event directive is compared against a noop directive with a compile and link function and the case with no directives.
-      The result shows how expensive it is to add a link function to a directive, as the delegate event directive has none.
-  </li>
-</ul>
-</p>
-
-<p>
-Results as of 7/31/2014:
-<ul>
-  <li>ngClick is very close to ngShow and text interpolation, especially when looking at a version of ngClick that does not use jqLite.on but element.addEventListener instead.</li>
-  <li>A delegate event directive that has no link function has the same speed as a directive with link function. I.e. ngClick is slower compared to the delegate event directive only because ngClick touches
-  the DOM for every element</li>
-  <li>A delegate event directive could be about 50% faster than ngClick. However, the overall performance
-      benefit depends on how many (and which) other directives are used on the same element
-      and what other things are part of the measures use case.
-      E.g. rows of a table with ngRepeat that use ngClick will probably also contain text interpolation.
-  </li>
-</ul>
-</p>
-
-Debug output:
-<ng-switch on="benchmarkType">
-  <div ng-switch-when="ngClick">
-    <div>
-      <span ng-repeat="row in ctrl.rows">
-        <span ng-click="a()">1</span>
-        <span ng-click="a()">1</span>
-        <span ng-click="a()">1</span>
-        <span ng-click="a()">1</span>
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="ngClickNoJqLite">
-    <div>
-      <span ng-repeat="row in ctrl.rows">
-        <span native-click="a()">1</span>
-        <span native-click="a()">1</span>
-        <span native-click="a()">1</span>
-        <span native-click="a()">1</span>
-        <span native-click="a()">1</span>
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="ngShow">
-    <div>
-      <span ng-repeat="row in ctrl.rows">
-        <span ng-show="true">1</span>
-        <span ng-show="true">1</span>
-        <span ng-show="true">1</span>
-        <span ng-show="true">1</span>
-        <span ng-show="true">1</span>
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="textInterpolation">
-    <div>
-      <span ng-repeat="row in ctrl.rows">
-        <span>{{row}}</span>
-        <span>{{row}}</span>
-        <span>{{row}}</span>
-        <span>{{row}}</span>
-        <span>{{row}}</span>
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="dlgtClick">
-    <div>
-      <span ng-repeat="row in ctrl.rows">
-        <span dlgt-click="a()">1</span>
-        <span dlgt-click="a()">1</span>
-        <span dlgt-click="a()">1</span>
-        <span dlgt-click="a()">1</span>
-        <span dlgt-click="a()">1</span>
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="noopDir">
-    <div>
-      <span ng-repeat="row in ctrl.rows">
-        <span noop-dir>1</span>
-        <span noop-dir>1</span>
-        <span noop-dir>1</span>
-        <span noop-dir>1</span>
-        <span noop-dir>1</span>
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="noop">
-    <div>
-      <span ng-repeat="row in ctrl.rows">
-        <span>1</span>
-        <span>1</span>
-        <span>1</span>
-        <span>1</span>
-        <span>1</span>
-      </span>
-    </div>
-  </div>
-
-</ng-switch>
-
-</div>
-</div>
-</div>
@@ -1,183 +0,0 @@
-var app = angular.module('largetableBenchmark', []);
-
-app.config(function($compileProvider) {
-  if ($compileProvider.debugInfoEnabled) {
-    $compileProvider.debugInfoEnabled(false);
-  }
-});
-
-app.filter('noop', function() {
-  return function(input) {
-    return input;
-  };
-});
-
-app.controller('DataController', function($scope, $rootScope) {
-  var totalRows = 1000;
-  var totalColumns = 20;
-
-  var data = $scope.data = [];
-  $scope.digestDuration = '?';
-  $scope.numberOfBindings = totalRows*totalColumns*2 + totalRows + 1;
-  $scope.numberOfWatches = '?';
-
-  function iGetter() { return this.i; }
-  function jGetter() { return this.j; }
-
-  for (var i=0; i<totalRows; i++) {
-    data[i] = [];
-    for (var j=0; j<totalColumns; j++) {
-      data[i][j] = {
-        i: i, j: j,
-        iFn: iGetter,
-        jFn: jGetter
-      };
-    }
-  }
-
-  var previousType;
-
-  benchmarkSteps.push({
-    name: 'destroy',
-    fn: function() {
-      $scope.$apply(function() {
-        previousType = $scope.benchmarkType;
-        $scope.benchmarkType = 'none';
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'create',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.benchmarkType = previousType;
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: '$apply',
-    fn: function() {
-      $rootScope.$apply();
-    }
-  });
-});
-
-var fn = function() { return 'x'};
-
-
-app.directive('baselineBindingTable', function() {
-  return {
-    restrict: 'E',
-    link: function ($scope, $element) {
-      var i, j, row, cell, comment;
-      var template = document.createElement('span');
-      template.setAttribute('ng-repeat', 'foo in foos');
-      template.classList.add('ng-scope');
-      template.appendChild(document.createElement('span'));
-      template.appendChild(document.createTextNode(':'));
-      template.appendChild(document.createElement('span'));
-      template.appendChild(document.createTextNode('|'));
-
-      for (i = 0; i < 1000; i++) {
-        row = document.createElement('div');
-        $element[0].appendChild(row);
-        for (j = 0; j < 20; j++) {
-          cell = template.cloneNode(true);
-          row.appendChild(cell);
-          cell.childNodes[0].textContent = i;
-          cell.childNodes[2].textContent = j;
-          cell.ng3992 = 'xxx';
-          comment = document.createComment('ngRepeat end: bar in foo');
-          row.appendChild(comment);
-        }
-
-        comment = document.createComment('ngRepeat end: foo in foos');
-        $element[0].appendChild(comment);
-      }
-    }
-  };
-});
-
-
-app.directive('baselineInterpolationTable', function() {
-  return {
-    restrict: 'E',
-    link: function ($scope, $element) {
-      var i, j, row, cell, comment;
-      var template = document.createElement('span');
-      template.setAttribute('ng-repeat', 'foo in foos');
-      template.classList.add('ng-scope');
-
-      for (i = 0; i < 1000; i++) {
-        row = document.createElement('div');
-        $element[0].appendChild(row);
-        for (j = 0; j < 20; j++) {
-          cell = template.cloneNode(true);
-          row.appendChild(cell);
-          cell.textContent = '' + i + ':' + j + '|';
-          cell.ng3992 = 'xxx';
-          comment = document.createComment('ngRepeat end: bar in foo');
-          row.appendChild(comment);
-        }
-
-        comment = document.createComment('ngRepeat end: foo in foos');
-        $element[0].appendChild(comment);
-      }
-    }
-  };
-});
-
-
-
-/*
-
-the fastest
-240/44
-
-app.directive('baselineTable', function() {
-  return function($scope, $element) {
-    var i, j, row, cell;
-
-    for (i = 0; i < 1000; i++) {
-      row = document.createElement('div');
-      for (j = 0; j < 20; j++) {
-        cell = document.createElement('span');
-        cell.textContent = '' + i + ':' + j;
-        row.appendChild(cell);
-      }
-      $element[0].appendChild(row);
-    }
-  };
-});
-
- */
-
-/*
-with comments and expando
-232/90
-
-app.directive('baselineTable', function() {
-  return function($scope, $element) {
-    var i, j, row, cell, comment;
-
-    for (i = 0; i < 1000; i++) {
-      row = document.createElement('div');
-      $element[0].appendChild(row);
-      for (j = 0; j < 20; j++) {
-        cell = document.createElement('span');
-        row.appendChild(cell);
-        cell.textContent = '' + i + ':' + j;
-        cell.ng3992 = 'xxx';
-        comment = document.createComment('ngRepeat end: bar in foo');
-        row.appendChild(comment);
-      }
-
-      comment = document.createComment('ngRepeat end: foo in foos');
-      $element[0].appendChild(comment);
-    }
-  };
-});
-
- */
@@ -1,15 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [{
-      id: 'jquery',
-      src: 'jquery-noop.js'
-    },
-    {
-      id: 'angular',
-      src: '/build/angular.js'
-    },
-    {
-      src: 'app.js',
-    }]
-  });
-};
@@ -1 +0,0 @@
-//Override me with ?jquery=/bower_components/jquery/dist/jquery.js
@@ -1,83 +0,0 @@
-<style>
-[ng-cloak] { display: none; }
-</style>
-<div ng-app="largetableBenchmark" ng-cloak>
-  <div ng-controller="DataController">
-    <div class="container-fluid">
-      <p>
-      Large table rendered with AngularJS
-      </p>
-
-      <div>none: <input type="radio" ng-model="benchmarkType" value="none"></div>
-      <div>baseline binding: <input type="radio" ng-model="benchmarkType" value="baselineBinding"></div>
-      <div>baseline interpolation: <input type="radio" ng-model="benchmarkType" value="baselineInterpolation"></div>
-      <div>ngBind: <input type="radio" ng-model="benchmarkType" value="ngBind"></div>
-      <div>ngBindOnce: <input type="radio" ng-model="benchmarkType" value="ngBindOnce"></div>
-      <div>interpolation: <input type="radio" ng-model="benchmarkType" value="interpolation"></div>
-      <div>attribute interpolation: <input type="radio" ng-model="benchmarkType" value="interpolationAttr"></div>
-      <div>ngBind + fnInvocation: <input type="radio" ng-model="benchmarkType" value="ngBindFn"></div>
-      <div>interpolation + fnInvocation: <input type="radio" ng-model="benchmarkType" value="interpolationFn"></div>
-      <div>ngBind + filter: <input type="radio" ng-model="benchmarkType" value="ngBindFilter"></div>
-      <div>interpolation + filter: <input type="radio" ng-model="benchmarkType" value="interpolationFilter"></div>
-
-      <ng-switch on="benchmarkType">
-        <baseline-binding-table ng-switch-when="baselineBinding">
-        </baseline-binding-table>
-        <baseline-interpolation-table ng-switch-when="baselineInterpolation">
-        </baseline-interpolation-table>
-        <div ng-switch-when="ngBind">
-          <h2>baseline binding</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in row">
-              <span ng-bind="column.i"></span>:<span ng-bind="column.j"></span>|
-            </span>
-          </div>
-        </div>
-        <div ng-switch-when="ngBindOnce">
-          <h2>baseline binding once</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in ::row">
-              <span ng-bind="::column.i"></span>:<span ng-bind="::column.j"></span>|
-            </span>
-          </div>
-        </div>
-        <div ng-switch-when="interpolation">
-          <h2>baseline interpolation</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in row">{{column.i}}:{{column.j}}|</span>
-          </div>
-        </div>
-        <div ng-switch-when="interpolationAttr">
-          <h2>attribute interpolation</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in row" i="{{column.i}}" j="{{column.j}}">i,j attrs</span>
-          </div>
-        </div>
-        <div ng-switch-when="ngBindFn">
-          <h2>bindings with functions</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in row"><span ng-bind="column.iFn()"></span>:<span ng-bind="column.jFn()"></span>|</span>
-          </div>
-        </div>
-        <div ng-switch-when="interpolationFn">
-          <h2>interpolation with functions</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in row">{{column.iFn()}}:{{column.jFn()}}|</span>
-          </div>
-        </div>
-        <div ng-switch-when="ngBindFilter">
-          <h2>bindings with filter</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in row"><span ng-bind="column.i | noop"></span>:<span ng-bind="column.j | noop"></span>|</span>
-          </div>
-        </div>
-        <div ng-switch-when="interpolationFilter">
-          <h2>interpolation with filter</h2>
-          <div ng-repeat="row in data">
-            <span ng-repeat="column in row">{{column.i | noop}}:{{column.j | noop}}|</span>
-          </div>
-        </div>
-      </ng-switch>
-    </div>
-  </div>
-</div>
@@ -1,48 +0,0 @@
-var app = angular.module('orderByBenchmark', []);
-
-app.controller('DataController', function($rootScope, $scope) {
-  this.ngRepeatCount = 5000;
-  this.rows = [];
-  var self = this;
-
-  $scope.benchmarkType = 'basic';
-
-  $scope.rawProperty = function(key) {
-    return function(item) {
-      return item[key];
-    };
-  };
-
-  // Returns a random integer between min (included) and max (excluded)
-  function getRandomInt(min, max) {
-    return Math.floor(Math.random() * (max - min)) + min;
-  }
-
-  benchmarkSteps.push({
-    name: 'setup',
-    description: 'Set rows to empty array and apply, then push new rows to be applied in next step',
-    fn: function() {
-      var oldRows = self.rows;
-      $rootScope.$apply(function() {
-        self.rows = [];
-      });
-      self.rows = oldRows;
-      if (self.rows.length !== self.ngRepeatCount) {
-        self.rows = [];
-        for (var i = 0; i < self.ngRepeatCount; i++) {
-          self.rows.push({
-            'name': getRandomInt(i, (i + 40)),
-            'index': i
-          });
-        }
-      }
-    }
-  })
-
-  benchmarkSteps.push({
-    name: '$apply',
-    fn: function() {
-      $rootScope.$apply();
-    }
-  });
-});
@@ -1,14 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [
-    {
-      "id": "jquery",
-      "src": "jquery-noop.js"
-    },{
-      id: 'angular',
-      src: '/build/angular.js'
-    },{
-      src: 'app.js',
-    }]
-  });
-};
@@ -1,82 +0,0 @@
-<div class="container-fluid" ng-app="orderByBenchmark">
-  <div class="row" ng-controller="DataController as ctrl">
-    <div class="col-lg-8">
-      <p>Filters</p>
-
-      <p>
-        <label>Number of ngRepeats:</label>
-        <input type="number" ng-model="ctrl.ngRepeatCount">
-      </p>
-
-      <p>
-        <div class="radio">
-          <label>
-            <input type="radio" ng-model="benchmarkType" value="baseline">baseline
-          </label>
-        </div>
-        <pre><code>ng-repeat="row in ctrl.rows"</code></pre>
-        <br />
-        <div class="radio">
-          <label>
-            <input type="radio" ng-model="benchmarkType" value="orderBy">orderBy
-          </label>
-        </div>
-        <pre><code>ng-repeat="row in ctrl.rows | orderBy:'name'"</code></pre>
-        <br />
-        <div class="radio">
-          <label>
-            <input type="radio" ng-model="benchmarkType" value="orderByArray">orderBy array expression
-          </label>
-        </div>
-        <pre><code>ng-repeat="row in ctrl.rows | orderBy:['name', 'index']"</code></pre>
-        <br />
-        <div class="radio">
-          <label>
-            <input type="radio" ng-model="benchmarkType"
-            value="orderByFunction">orderBy function expression
-          </label>
-        </div>
-        <pre><code>ng-repeat="row in ctrl.rows | orderBy:rawProperty('name')"</code></pre>
-        <br />
-        <div class="radio">
-          <label>
-            <input type="radio" ng-model="benchmarkType"
-            value="orderByArrayFunction">orderBy array function expression
-          </label>
-        </div>
-        <pre><code>ng-repeat="row in ctrl.rows | orderBy:[rawProperty('name'), rawProperty('index')]"</code></pre>
-      </p>
-
-
-      Debug output:
-      <ng-switch on="benchmarkType">
-        <div ng-switch-when="baseline">
-          <span ng-repeat="row in ctrl.rows">
-            <span ng-bind="row.name"></span>,
-          </span>
-        </div>
-        <div ng-switch-when="orderBy">
-          <span ng-repeat="row in ctrl.rows | orderBy:'name'">
-            <span ng-bind="row.name"></span>,
-          </span>
-        </div>
-        <div ng-switch-when="orderByArray">
-          <span ng-repeat="row in ctrl.rows | orderBy:['name', 'index']">
-            <span ng-bind="row.name"></span>,
-          </span>
-        </div>
-        <div ng-switch-when="orderByFunction">
-          <span ng-repeat="row in ctrl.rows | orderBy:rawProperty('name')">
-            <span ng-bind="row.name"></span>,
-          </span>
-        </div>
-        <div ng-switch-when="orderByArrayFunction">
-          <span ng-repeat="row in ctrl.rows | orderBy:[rawProperty('name'), rawProperty('index')]">
-            <span ng-bind="row.name"></span>,
-          </span>
-        </div>
-      </ng-switch>
-
-    </div>
-  </div>
-</div>
@@ -1,87 +0,0 @@
-var app = angular.module('parsedExpressionBenchmark', []);
-
-app.config(function($compileProvider) {
-  if ($compileProvider.debugInfoEnabled) {
-    $compileProvider.debugInfoEnabled(false);
-  }
-});
-
-app.filter('noop', function() {
-  return function(input) {
-    return input;
-  };
-});
-
-//Executes the specified expression as a watcher
-app.directive('bmPeWatch', function() {
-  return {
-    restrict: 'A',
-    compile: function($element, $attrs) {
-      $element.text( $attrs.bmPeWatch );
-      return function($scope, $element, $attrs) {
-        $scope.$watch($attrs.bmPeWatch, function(val) {
-          $element.text(val);
-
-        });
-      };
-    }
-  };
-});
-
-//Executes the specified expression as a watcher
-//Adds a simple wrapper method to allow use of $watch instead of $watchCollection
-app.directive('bmPeWatchLiteral', function($parse) {
-  function retZero() {
-    return 0;
-  }
-
-  return {
-    restrict: 'A',
-    compile: function($element, $attrs) {
-      $element.text( $attrs.bmPeWatchLiteral );
-      return function($scope, $element, $attrs) {
-        $scope.$watch( $parse($attrs.bmPeWatchLiteral, retZero) );
-      };
-    }
-  };
-});
-
-app.controller('DataController', function($scope, $rootScope) {
-  var totalRows = 10000;
-
-  var data = $scope.data = [];
-
-  var star = '*';
-
-  $scope.func = function() { return star;};
-
-  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]
-    });
-  }
-
-  benchmarkSteps.push({
-    name: '$apply',
-    fn: function() {
-      for (var i=0; i<50; i++) {
-        $rootScope.$digest();
-      }
-    }
-  });
-});
@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [    {
-      id: 'angular',
-      src: '/build/angular.js'
-    },
-    {
-      src: 'app.js',
-    }]
-  });
-};
@@ -1,226 +0,0 @@
-<div ng-app="parsedExpressionBenchmark" ng-cloak>
-  <div ng-controller="DataController">
-    <div class="container-fluid">
-      <p>
-        Tests the execution of $parse()ed expressions. Each test tries to isolate specific expression types. Expressions should (probably) not be constant so they get evaluated per digest.
-      </p>
-
-      <ul style="list-style:none">
-        <li>
-          <input type="radio" ng-model="expressionType" value="simplePath" id="simplePath">
-          <label for="simplePath">Simple Paths</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="complexPath" id="complexPath">
-          <label for="complexPath">Complex Paths</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="constructorPath" id="constructorPath">
-          <label for="constructorPath">Constructor Paths</label>
-          ($parse special cases "constructor" for security)
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="fieldAccess" id="fieldAccess">
-          <label for="fieldAccess">Field Accessors</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="fieldIndex" id="fieldIndex">
-          <label for="fieldIndex">Field Indexes</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="operators" id="operators">
-          <label for="operators">Binary/Unary operators</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
-          <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="filters" id="filters">
-          <label for="filters">Filters</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="functionCalls" id="functionCalls">
-          <label for="functionCalls">Function calls</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="objectLiterals" id="objectLiterals">
-          <label for="objectLiterals">Object Literals</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="arrayLiterals" id="arrayLiterals">
-          <label for="arrayLiterals">Array Literals</label>
-        </li>
-      </ul>
-
-      <!--
-        NOTES:
-          - ensure each tested expression has at least one variable in it to avoid constant expressions
-      -->
-
-      <ul ng-switch="expressionType">
-        <li ng-switch-when="simplePath" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="rowIdx"></span>
-          <span bm-pe-watch="row.index"></span>
-          <span bm-pe-watch="row.num0"></span>
-          <span bm-pe-watch="row.num1"></span>
-          <span bm-pe-watch="row.num2"></span>
-          <span bm-pe-watch="row.str0"></span>
-          <span bm-pe-watch="row.str1"></span>
-          <span bm-pe-watch="row.str2"></span>
-          <span bm-pe-watch="row.date0"></span>
-          <span bm-pe-watch="row.obj"></span>
-          <span bm-pe-watch="row.keys"></span>
-        </li>
-
-        <li ng-switch-when="constructorPath" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="row.index"></span>
-          <span bm-pe-watch="row.constructor.index"></span>
-          <span bm-pe-watch="row.constructor.index"></span>
-          <span bm-pe-watch="row.constructor.index"></span>
-          <span bm-pe-watch="row.constructor.constructor.index"></span>
-          <span bm-pe-watch="row.constructor.constructor.index"></span>
-          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
-          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
-        </li>
-
-        <li ng-switch-when="complexPath" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="row.index"></span>
-          <span bm-pe-watch="row.num0"></span>
-          <span bm-pe-watch="row.num1"></span>
-          <span bm-pe-watch="row.str0"></span>
-          <span bm-pe-watch="row.str1"></span>
-          <span bm-pe-watch="row.obj.index"></span>
-          <span bm-pe-watch="row.obj.index"></span>
-          <span bm-pe-watch="row.obj.index"></span>
-          <span bm-pe-watch="row.obj.obj.index"></span>
-          <span bm-pe-watch="row.obj.obj.index"></span>
-          <span bm-pe-watch="row.obj.obj.obj.index"></span>
-          <span bm-pe-watch="row.obj.obj.obj.index"></span>
-        </li>
-
-        <li ng-switch-when="fieldAccess" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="data[rowIdx].index"></span>
-          <span bm-pe-watch="data[rowIdx].num0"></span>
-          <span bm-pe-watch="data[rowIdx].num1"></span>
-          <span bm-pe-watch="data[rowIdx].str0"></span>
-          <span bm-pe-watch="data[rowIdx].str1"></span>
-          <span bm-pe-watch="data[rowIdx].obj.index"></span>
-          <span bm-pe-watch="data[rowIdx].obj.index"></span>
-          <span bm-pe-watch="data[rowIdx].obj.index"></span>
-          <span bm-pe-watch="data[rowIdx].obj.obj.index"></span>
-          <span bm-pe-watch="data[rowIdx].obj.obj.index"></span>
-          <span bm-pe-watch="data[rowIdx].obj.obj.obj.index"></span>
-          <span bm-pe-watch="data[rowIdx].obj.obj.obj.index"></span>
-        </li>
-
-        <li ng-switch-when="fieldIndex" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="data[rowIdx]"></span>
-          <span bm-pe-watch="row['str0']"></span>
-          <span bm-pe-watch="row['str1']"></span>
-          <span bm-pe-watch="data[row['index']]['index']"></span>
-          <span bm-pe-watch="data[rowIdx]['obj']"></span>
-          <span bm-pe-watch="data[rowIdx]['obj']['obj']"></span>
-          <span bm-pe-watch="row[row['keys'][0]]"></span>
-          <span bm-pe-watch="row[row['keys'][1]]"></span>
-          <span bm-pe-watch="row[row['keys'][2]]"></span>
-          <span bm-pe-watch="row[row['keys'][3]]"></span>
-          <span bm-pe-watch="row[row['keys'][4]]"></span>
-          <span bm-pe-watch="row[row['keys'][5]]"></span>
-
-        </li>
-
-        <li ng-switch-when="operators" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="+rowIdx"></span>
-          <span bm-pe-watch="-rowIdx"></span>
-          <span bm-pe-watch="rowIdx + 1"></span>
-          <span bm-pe-watch="rowIdx - 1"></span>
-          <span bm-pe-watch="rowIdx * 2"></span>
-          <span bm-pe-watch="rowIdx + -1"></span>
-          <span bm-pe-watch="rowIdx - -1"></span>
-          <span bm-pe-watch="-rowIdx * 2 + 1"></span>
-          <span bm-pe-watch="rowIdx % 2"></span>
-          <span bm-pe-watch="rowIdx % 2 === 1"></span>
-          <span bm-pe-watch="rowIdx % 2 === 0"></span>
-          <span bm-pe-watch="rowIdx / 1"></span>
-          <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
-        </li>
-
-        <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="rowIdx && row.odd"></span>
-          <span bm-pe-watch="row.odd && row.even"></span>
-          <span bm-pe-watch="row.odd && !row.even"></span>
-          <span bm-pe-watch="row.odd || row.even"></span>
-          <span bm-pe-watch="row.odd || row.even || row.index"></span>
-          <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
-          <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
-          <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
-        </li>
-
-        <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="rowIdx | noop"></span>
-          <span bm-pe-watch="rowIdx | noop"></span>
-          <span bm-pe-watch="rowIdx | noop"></span>
-          <span bm-pe-watch="rowIdx | noop:1"></span>
-          <span bm-pe-watch="rowIdx | noop:rowIdx"></span>
-          <span bm-pe-watch="rowIdx | noop:1:2:3:4:5"></span>
-          <span bm-pe-watch="rowIdx | noop:rowIdx:rowIdx:rowIdx"></span>
-          <span bm-pe-watch="rowIdx | noop | noop"></span>
-          <span bm-pe-watch="rowIdx | noop:1 | noop"></span>
-          <span bm-pe-watch="rowIdx | noop | noop:null:undefined:0"></span>
-          <span bm-pe-watch="rowIdx | noop | noop | noop"></span>
-          <span bm-pe-watch="rowIdx | noop:1 | noop:2 | noop:3"></span>
-        </li>
-
-        <li ng-switch-when="functionCalls" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="func()"></span>
-          <span bm-pe-watch="func(1)"></span>
-          <span bm-pe-watch="func(1, 2)"></span>
-          <span bm-pe-watch="func(1, 2, 3)"></span>
-          <span bm-pe-watch="row.func()"></span>
-          <span bm-pe-watch="row.func(1)"></span>
-          <span bm-pe-watch="row.func(1, 2)"></span>
-          <span bm-pe-watch="row.func(1, 2, 3)"></span>
-          <span bm-pe-watch="func(func())"></span>
-          <span bm-pe-watch="func(func(), func())"></span>
-          <span bm-pe-watch="row.func(row.func())"></span>
-          <span bm-pe-watch="row.func(row.func(), row.func())"></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>
-          <span bm-pe-watch-literal="{0: row, 1: rowIdx, 2: 3}"></span>
-          <span bm-pe-watch-literal="{str: 'foo', num: rowIdx, b: true}"></span>
-          <span bm-pe-watch-literal="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
-          <span bm-pe-watch-literal="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
-        </li>
-
-        <li ng-switch-when="arrayLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch-literal="[rowIdx]"></span>
-          <span bm-pe-watch-literal="[rowIdx, 0]"></span>
-          <span bm-pe-watch-literal="[rowIdx, 0, 1]"></span>
-          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2]"></span>
-          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2, 3]"></span>
-          <span bm-pe-watch-literal="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
-          <span bm-pe-watch-literal="[rowIdx, undefined, null, true, false]"></span>
-          <span bm-pe-watch-literal="[[][0], [0][0], [][rowIdx]]"></span>
-          <span bm-pe-watch-literal="[0, rowIdx]"></span>
-          <span bm-pe-watch-literal="[0, 1, rowIdx]"></span>
-          <span bm-pe-watch-literal="[0, 1, 2, rowIdx]"></span>
-          <span bm-pe-watch-literal="[0, 1, 2, 3, rowIdx]"></span>
-        </li>
-      </ul>
-    </div>
-  </div>
-</div>
@@ -1,8 +1,8 @@
 {
  "name": "AngularJS",
  "devDependencies": {
-    "jquery": "2.1.1",
-    "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
+    "jquery": "1.10.2",
+    "closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip",
    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
  }
 }
@@ -112,7 +112,7 @@ var printSection = function(stream, title, section, printCommitLinks) {
        }
        stream.write(')\n');
      } else {
-        stream.write(util.format('%s %s\n', prefix, commit.subject));
+        stream.write(util.format('%s %s', prefix, commit.subject));
      }
    });
  });
@@ -188,7 +188,6 @@ var getPreviousTag = function() {


 var generate = function(version, file) {
-
  getPreviousTag().then(function(tag) {
    console.log('Reading git log since', tag);
    readGitLog('^fix|^feat|^perf|BREAKING', tag).then(function(commits) {
@@ -202,7 +201,6 @@ var generate = function(version, file) {

 // publish for testing
 exports.parseRawCommit = parseRawCommit;
-exports.printSection = printSection;

 // hacky start if not run by jasmine :-D
 if (process.argv.join('').indexOf('jasmine-node') === -1) {
@@ -1,4 +1,4 @@
-/* global describe: false, beforeEach: false, afterEach: false, it: false, expect: false */
+/* global describe: false, it: false, expect: false */

 'use strict';

@@ -44,65 +44,4 @@ describe('changelog.js', function() {
      expect(msg.breaking).toEqual(' first breaking change\nsomething else\nanother line with more info\n');
    });
  });
-
-  describe('printSection', function() {
-    var output;
-    var streamMock = {
-      write: function(str) {
-        output += str;
-      }
-    };
-
-    beforeEach(function() {
-      output = '';
-    });
-
-    it('should add a new line at the end of each breaking change list item ' +
-       'when there is 1 item per component', function() {
-      var title = 'test';
-      var printCommitLinks = false;
-
-      var section = {
-        module1: [{subject: 'breaking change 1'}],
-        module2: [{subject: 'breaking change 2'}]
-      };
-      var expectedOutput =
-          '\n' + '## test\n\n' +
-          '- **module1:** breaking change 1\n' +
-          '- **module2:** breaking change 2\n' +
-          '\n';
-
-      ch.printSection(streamMock, title, section, printCommitLinks);
-      expect(output).toBe(expectedOutput);
-    });
-
-    it('should add a new line at the end of each breaking change list item ' +
-       'when there are multiple items per component', function() {
-      var title = 'test';
-      var printCommitLinks = false;
-
-      var section = {
-        module1: [
-          {subject: 'breaking change 1.1'},
-          {subject: 'breaking change 1.2'}
-        ],
-        module2: [
-          {subject: 'breaking change 2.1'},
-          {subject: 'breaking change 2.2'}
-        ]
-      };
-      var expectedOutput =
-          '\n' + '## test\n\n' +
-          '- **module1:**\n' +
-          '  - breaking change 1.1\n' +
-          '  - breaking change 1.2\n' +
-          '- **module2:**\n' +
-          '  - breaking change 2.1\n' +
-          '  - breaking change 2.2\n' +
-          '\n';
-
-      ch.printSection(streamMock, title, section, printCommitLinks);
-      expect(output).toBe(expectedOutput);
-    });
-  });
 });
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/local/bin/node

 'use strict';

@@ -123,12 +123,9 @@ then(function (tags) {
    value();
 }).
 then(function (tags) {
-  var master = tags.pop();
-  var stable = tags.pop();
-
  return [
-    { name: stable.replace(/\d+$/, 'x'), tag: stable },
-    { name: 'master', tag: master}
+    { name: 'v1.0.x', tag: tags[0] },
+    { name: 'master', tag: tags[1] }
  ];
 }).
 then(allInSeries(function (branch) {
@@ -145,7 +142,7 @@ then(allInSeries(function (branch) {
        line = line.split(' ');
        var sha = line.shift();
        var msg = line.join(' ');
-        return sha + ((/fix\([^\)]+\):/i.test(msg))  ? ' * ' : '   ') + msg;
+        return sha + (msg.toLowerCase().indexOf('fix') === -1 ? '   ' : ' * ') + msg;
      });
      branch.log = log.map(function (line) {
        return line.substr(41);
@@ -2,10 +2,21 @@

 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
 .ng-cloak, .x-ng-cloak,
-.ng-hide:not(.ng-hide-animate) {
+.ng-hide {
  display: none !important;
 }

 ng\:form {
  display: block;
 }
+
+.ng-animate-block-transitions {
+  transition:0s all!important;
+  -webkit-transition:0s all!important;
+}
+
+/* show the element during a show/hide animation when the
+ * animation is ongoing, but the .ng-hide class is active */
+.ng-hide-add-active, .ng-hide-remove {
+  display: block!important;
+}
@@ -128,10 +128,6 @@ h1,h2,h3,h4,h5,h6 {
  margin-bottom:5px;
 }

-.nav-index-group .nav-index-listing.current a {
-  color: #B52E31;
-}
-
 .nav-breadcrumb {
  margin:4px 0;
  padding:0;
@@ -320,10 +316,10 @@ iframe.example {
 }

 .search-results-group.col-group-api { width:30%; }
-.search-results-group.col-group-guide,
-.search-results-group.col-group-tutorial { width:20%; }
+.search-results-group.col-group-guide { width:30%; }
+.search-results-group.col-group-tutorial { width:25%; }
 .search-results-group.col-group-misc,
-.search-results-group.col-group-error { width:15%; float: right; }
+.search-results-group.col-group-error { float:right; clear:both; width:15% }


 .search-results-group.col-group-api .search-result {
@@ -395,6 +391,7 @@ iframe.example {
  position:fixed;
  top:120px;
  bottom:0;
+  padding-bottom:120px;
  overflow:auto;
 }

@@ -415,7 +412,6 @@ iframe.example {

 .main-body-grid .side-navigation {
  position:relative;
-  padding-bottom:120px;
 }

 .main-body-grid .side-navigation.ng-hide {
@@ -0,0 +1,284 @@
+'use strict';
+
+var directive = {};
+var service = { value: {} };
+
+var DEPENDENCIES = {
+  'angular.js': 'http://code.angularjs.org/' + angular.version.full + '/angular.min.js',
+  'angular-resource.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-resource.min.js',
+  'angular-route.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-route.min.js',
+  'angular-animate.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-animate.min.js',
+  'angular-sanitize.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-sanitize.min.js',
+  'angular-cookies.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-cookies.min.js'
+};
+
+
+function escape(text) {
+  return text.
+    replace(/\&/g, '&amp;').
+    replace(/\</g, '&lt;').
+    replace(/\>/g, '&gt;').
+    replace(/"/g, '&quot;');
+}
+
+/**
+ * http://stackoverflow.com/questions/451486/pre-tag-loses-line-breaks-when-setting-innerhtml-in-ie
+ * http://stackoverflow.com/questions/195363/inserting-a-newline-into-a-pre-tag-ie-javascript
+ */
+function setHtmlIe8SafeWay(element, html) {
+  var newElement = angular.element('<pre>' + html + '</pre>');
+
+  element.empty();
+  element.append(newElement.contents());
+  return element;
+}
+
+
+directive.jsFiddle = function(getEmbeddedTemplate, escape, script) {
+  return {
+    terminal: true,
+    link: function(scope, element, attr) {
+      var name = '',
+        stylesheet = '<link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css">\n',
+        fields = {
+          html: '',
+          css: '',
+          js: ''
+        };
+
+      angular.forEach(attr.jsFiddle.split(' '), function(file, index) {
+        var fileType = file.split('.')[1];
+
+        if (fileType == 'html') {
+          if (index == 0) {
+            fields[fileType] +=
+              '<div ng-app' + (attr.module ? '="' + attr.module + '"' : '') + '>\n' +
+                getEmbeddedTemplate(file, 2);
+          } else {
+            fields[fileType] += '\n\n\n  <!-- CACHE FILE: ' + file + ' -->\n' +
+              '  <script type="text/ng-template" id="' + file + '">\n' +
+              getEmbeddedTemplate(file, 4) +
+              '  </script>\n';
+          }
+        } else {
+          fields[fileType] += getEmbeddedTemplate(file) + '\n';
+        }
+      });
+
+      fields.html += '</div>\n';
+
+      setHtmlIe8SafeWay(element,
+        '<form class="jsfiddle" method="post" action="http://jsfiddle.net/api/post/library/pure/" target="_blank">' +
+          hiddenField('title', 'AngularJS Example: ' + name) +
+          hiddenField('css', '</style> <!-- Ugly Hack due to jsFiddle issue: http://goo.gl/BUfGZ --> \n' +
+            stylesheet +
+            script.angular +
+            (attr.resource ? script.resource : '') +
+            '<style>\n' +
+            fields.css) +
+          hiddenField('html', fields.html) +
+          hiddenField('js', fields.js) +
+          '<button class="btn btn-primary"><i class="icon-white icon-pencil"></i> Edit Me</button>' +
+          '</form>');
+
+      function hiddenField(name, value) {
+        return '<input type="hidden" name="' +  name + '" value="' + escape(value) + '">';
+      }
+    }
+  }
+};
+
+
+
+directive.ngSetText = ['getEmbeddedTemplate', function(getEmbeddedTemplate) {
+  return {
+    restrict: 'CA',
+    priority: 10,
+    compile: function(element, attr) {
+      setHtmlIe8SafeWay(element, escape(getEmbeddedTemplate(attr.ngSetText)));
+    }
+  }
+}]
+
+
+directive.ngHtmlWrap = ['reindentCode', 'templateMerge', function(reindentCode, templateMerge) {
+  return {
+    compile: function(element, attr) {
+      var properties = {
+            head: '',
+            module: '',
+            body: element.text()
+          },
+        html = "<!doctype html>\n<html ng-app{{module}}>\n  <head>\n{{head:4}}  </head>\n  <body>\n{{body:4}}  </body>\n</html>";
+
+      angular.forEach((attr.ngHtmlWrap || '').split(' '), function(dep) {
+        if (!dep) return;
+        dep = DEPENDENCIES[dep] || dep;
+
+        var ext = dep.split(/\./).pop();
+
+        if (ext == 'css') {
+          properties.head += '<link rel="stylesheet" href="' + dep + '" type="text/css">\n';
+        } else if(ext == 'js') {
+          properties.head += '<script src="' + dep + '"></script>\n';
+        } else {
+          properties.module = '="' + dep + '"';
+        }
+      });
+
+      setHtmlIe8SafeWay(element, escape(templateMerge(html, properties)));
+    }
+  }
+}];
+
+
+directive.ngSetHtml = ['getEmbeddedTemplate', function(getEmbeddedTemplate) {
+  return {
+    restrict: 'CA',
+    priority: 10,
+    compile: function(element, attr) {
+      setHtmlIe8SafeWay(element, getEmbeddedTemplate(attr.ngSetHtml));
+    }
+  }
+}];
+
+
+directive.ngEvalJavascript = ['getEmbeddedTemplate', function(getEmbeddedTemplate) {
+  return {
+    compile: function (element, attr) {
+      var fileNames = attr.ngEvalJavascript.split(' ');
+      angular.forEach(fileNames, function(fileName) {
+        var script = getEmbeddedTemplate(fileName);
+        try {
+          if (window.execScript) { // IE
+            window.execScript(script || '""'); // IE complains when evaling empty string
+          } else {
+            window.eval(script + '//@ sourceURL=' + fileName);
+          }
+        } catch (e) {
+          if (window.console) {
+            window.console.log(script, '\n', e);
+          } else {
+            window.alert(e);
+          }
+        }
+      });
+    }
+  };
+}];
+
+
+directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', '$sniffer', '$animate',
+                function($templateCache,   $browser,  docsRootScope, $location,   $sniffer,   $animate) {
+  return {
+    terminal: true,
+    link: function(scope, element, attrs) {
+      var modules = ['ngAnimate'],
+          embedRootScope,
+          deregisterEmbedRootScope;
+
+      modules.push(['$provide', function($provide) {
+        $provide.value('$templateCache', $templateCache);
+        $provide.value('$anchorScroll', angular.noop);
+        $provide.value('$browser', $browser);
+        $provide.value('$sniffer', $sniffer);
+        $provide.value('$animate', $animate);
+        $provide.provider('$location', function() {
+          this.$get = ['$rootScope', function($rootScope) {
+            docsRootScope.$on('$locationChangeSuccess', function(event, oldUrl, newUrl) {
+              $rootScope.$broadcast('$locationChangeSuccess', oldUrl, newUrl);
+            });
+            return $location;
+          }];
+          this.html5Mode = angular.noop;
+        });
+
+        $provide.decorator('$rootScope', ['$delegate', function($delegate) {
+          embedRootScope = $delegate;
+
+          // Since we are teleporting the $animate service, which relies on the $$postDigestQueue
+          // we need the embedded scope to use the same $$postDigestQueue as the outer scope
+          embedRootScope.$$postDigestQueue = docsRootScope.$$postDigestQueue;
+
+          deregisterEmbedRootScope = docsRootScope.$watch(function embedRootScopeDigestWatch() {
+            embedRootScope.$digest();
+          });
+
+          return embedRootScope;
+        }]);
+      }]);
+      if (attrs.ngEmbedApp)  modules.push(attrs.ngEmbedApp);
+
+      element.on('click', function(event) {
+        if (event.target.attributes.getNamedItem('ng-click')) {
+          event.preventDefault();
+        }
+      });
+
+      element.bind('$destroy', function() {
+        deregisterEmbedRootScope();
+        embedRootScope.$destroy();
+      });
+
+      element.data('$injector', null);
+      angular.bootstrap(element, modules);
+    }
+  };
+}];
+
+service.reindentCode = function() {
+  return function (text, spaces) {
+    if (!text) return text;
+    var lines = text.split(/\r?\n/);
+    var prefix = '      '.substr(0, spaces || 0);
+    var i;
+
+    // remove any leading blank lines
+    while (lines.length && lines[0].match(/^\s*$/)) lines.shift();
+    // remove any trailing blank lines
+    while (lines.length && lines[lines.length - 1].match(/^\s*$/)) lines.pop();
+    var minIndent = 999;
+    for (i = 0; i < lines.length; i++) {
+      var line = lines[0];
+      var reindentCode = line.match(/^\s*/)[0];
+      if (reindentCode !== line && reindentCode.length < minIndent) {
+        minIndent = reindentCode.length;
+      }
+    }
+
+    for (i = 0; i < lines.length; i++) {
+      lines[i] = prefix + lines[i].substring(minIndent);
+    }
+    lines.push('');
+    return lines.join('\n');
+  }
+};
+
+service.templateMerge = ['reindentCode', function(indentCode) {
+  return function(template, properties) {
+    return template.replace(/\{\{(\w+)(?:\:(\d+))?\}\}/g, function(_, key, indent) {
+      var value = properties[key];
+
+      if (indent) {
+        value = indentCode(value, indent);
+      }
+
+      return value == undefined ? '' : value;
+    });
+  };
+}];
+
+service.getEmbeddedTemplate = ['reindentCode', function(reindentCode) {
+  return function (id) {
+    var element = document.getElementById(id);
+
+    if (!element) {
+      return null;
+    }
+
+    return reindentCode(angular.element(element).html(), 0);
+  }
+}];
+
+
+angular.module('bootstrapPrettify', []).directive(directive).factory(service);
@@ -274,13 +274,13 @@ var popoverElement = function() {
      this.contentElement = angular.element(inner.childNodes[1]);

      //stop the click on the tooltip
-      this.element.on('click', function(event) {
+      this.element.bind('click', function(event) {
        event.preventDefault();
        event.stopPropagation();
      });

      var self = this;
-      angular.element(document.body).on('click',function(event) {
+      angular.element(document.body).bind('click',function(event) {
        if(self.visible()) self.hide();
      });
    },
@@ -359,7 +359,7 @@ directive.popover = ['popoverElement', function(popover) {
    restrict: 'A',
    priority : 500,
    link: function(scope, element, attrs) {
-      element.on('click',function(event) {
+      element.bind('click',function(event) {
        event.preventDefault();
        event.stopPropagation();
        if(popover.isSituatedAt(element) && popover.visible()) {
@@ -396,7 +396,7 @@ directive.foldout = ['$http', '$animate','$window', function($http, $animate, $w
      if(/\/build\//.test($window.location.href)) {
        url = '/build/docs' + url;
      }
-      element.on('click',function() {
+      element.bind('click',function() {
        scope.$apply(function() {
          if(!container) {
            if(loading) return;
@@ -35,8 +35,8 @@ angular.module('ui.bootstrap.dropdown', [])

  this.open = function( dropdownScope ) {
    if ( !openScope ) {
-      $document.on('click', closeDropdown);
-      $document.on('keydown', escapeKeyBind);
+      $document.bind('click', closeDropdown);
+      $document.bind('keydown', escapeKeyBind);
    }

    if ( openScope && openScope !== dropdownScope ) {
@@ -49,8 +49,8 @@ angular.module('ui.bootstrap.dropdown', [])
  this.close = function( dropdownScope ) {
    if ( openScope === dropdownScope ) {
      openScope = null;
-      $document.off('click', closeDropdown);
-      $document.off('keydown', escapeKeyBind);
+      $document.unbind('click', closeDropdown);
+      $document.unbind('keydown', escapeKeyBind);
    }
  };

@@ -124,7 +124,7 @@ angular.module('ui.bootstrap.dropdown', [])
        return;
      }

-      element.on('click', function(event) {
+      element.bind('click', function(event) {
        event.preventDefault();
        event.stopPropagation();

@@ -1,44 +0,0 @@
-"use strict";
-/* jshint browser: true */
-/* global importScripts, onmessage: true, postMessage, lunr */
-
-// Load up the lunr library
-importScripts('../components/lunr.js-0.4.2/lunr.min.js');
-
-// Create the lunr index - the docs should be an array of object, each object containing
-// the path and search terms for a page
-var index = lunr(function() {
-  this.ref('path');
-  this.field('titleWords', {boost: 50});
-  this.field('members', { boost: 40});
-  this.field('keywords', { boost : 20 });
-});
-
-// Retrieve the searchData which contains the information about each page to be indexed
-var searchData = {};
-var searchDataRequest = new XMLHttpRequest();
-searchDataRequest.onload = function() {
-
-  // Store the pages data to be used in mapping query results back to pages
-  searchData = JSON.parse(this.responseText);
-  // Add search terms from each page to the search index
-  searchData.forEach(function(page) {
-    index.add(page);
-  });
-  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) {
-  var q = oEvent.data.q;
-  var hits = index.search(q);
-  var results = [];
-  // Only return the array of paths to pages
-  hits.forEach(function(hit) {
-    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 });
-};
@@ -5,15 +5,15 @@ describe("doc.angularjs.org", function() {
  describe("API pages", function() {

    it("should display links to code on GitHub", function() {
-      browser.get('build/docs/index.html#!/api/ng/service/$http');
+      browser.get('index-debug.html#!/api/ng/service/$http');
      expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);

-      browser.get('build/docs/index.html#!/api/ng/service/$http');
+      browser.get('index-debug.html#!/api/ng/service/$http');
      expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
    });

    it('should change the page content when clicking a link to a service', function () {
-      browser.get('build/docs/index.html');
+      browser.get('');

      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
      ngBindLink.click();
@@ -24,7 +24,7 @@ describe("doc.angularjs.org", function() {


    it('should show the functioning input directive example', function () {
-      browser.get('build/docs/index.html#!/api/ng/directive/input');
+      browser.get('index-debug.html#!/api/ng/directive/input');

      // Ensure that the page is loaded before trying to switch frames.
      browser.waitForAngular();
@@ -39,7 +39,7 @@ describe("doc.angularjs.org", function() {
    });

    it("should trim indentation from code blocks", function() {
-      browser.get('build/docs/index.html#!/api/ng/type/$rootScope.Scope');
+      browser.get('index-debug.html#!/api/ng/type/$rootScope.Scope');

      var codeBlocks = element.all(by.css('pre > code.lang-js'));
      codeBlocks.each(function(codeBlock) {
@@ -3,7 +3,7 @@
 describe("provider pages", function() {

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

  it("should show the related provider if there is one", function() {
-    browser.get('build/docs/index.html#!/api/ng/service/$compile');
+    browser.get('index-debug.html#!/api/ng/service/$compile');
    var providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
    expect(providerLink.getText()).toEqual('- $compileProvider');
    expect(providerLink.getAttribute('href')).toMatch(/api\/ng\/provider\/\$compileProvider/);

-    browser.get('build/docs/index.html#!/api/ng/service/$q');
+    browser.get('index-debug.html#!/api/ng/service/$q');
    providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
    expect(providerLink.getText()).not.toEqual('- $qProvider');
    expect(providerLink.getAttribute('href')).not.toMatch(/api\/ng\/provider\/\$compileProvider/);
  });

  it("should show parameter defaults", function() {
-    browser.get('build/docs/index.html#!/api/ng/service/$timeout');
+    browser.get('index-debug.html#!/api/ng/service/$timeout');
    expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
  });

@@ -1,29 +1,6 @@
 'use strict';

-var webdriver = require('protractor/node_modules/selenium-webdriver');
-
 describe('docs.angularjs.org', function () {
-
-  beforeEach(function() {
-    // read and clear logs from previous tests
-    browser.manage().logs().get('browser');
-  });
-
-
-  afterEach(function() {
-    // verify that there were no console errors in the browser
-    browser.manage().logs().get('browser').then(function(browserLog) {
-      var filteredLog = browserLog.filter(function(logEntry) {
-        return logEntry.level.value > webdriver.logging.Level.WARNING.value;
-      });
-      expect(filteredLog.length).toEqual(0);
-      if (filteredLog.length) {
-        console.log('browser console errors: ' + require('util').inspect(filteredLog));
-      }
-    });
-  });
-
-
  describe('App', function () {
    // it('should filter the module list when searching', function () {
    //   browser.get();
@@ -39,7 +16,7 @@ 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');
+      browser.get('');

      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
      ngBindLink.click();
@@ -51,36 +28,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('index-debug.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('index-debug.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('index-debug.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');
+      browser.get('index-debug.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
      expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
    });

+
    it("should display an error if the page does not exist", function() {
-      browser.get('build/docs/index.html#!/api/does/not/exist');
+      browser.get('index-debug.html#!/api/does/not/exist');
      expect(element(by.css('h1')).getText()).toBe('Oops!');
    });
-
  });

-});
+});
@@ -6,7 +6,6 @@ angular.module('docsApp', [
  'DocsController',
  'versionsData',
  'pagesData',
-  'navData',
  'directives',
  'errors',
  'examples',
@@ -14,9 +13,11 @@ angular.module('docsApp', [
  'tutorials',
  'versions',
  'bootstrap',
+  'bootstrapPrettify',
  'ui.bootstrap.dropdown'
 ])

-.config(['$locationProvider', function($locationProvider) {
+
+.config(function($locationProvider) {
  $locationProvider.html5Mode(true).hashPrefix('!');
-}]);
+});
@@ -22,16 +22,11 @@ angular.module('directives', [])
    terminal: true,
    compile: function(element) {
      var linenums = element.hasClass('linenum');// || element.parent()[0].nodeName === 'PRE';
-      var match = /lang-(\S+)/.exec(element[0].className);
+      var match = /lang-(\S)+/.exec(element.className);
      var lang = match && match[1];
      var html = element.html();
      element.html(window.prettyPrintOne(html, lang, linenums));
    }
  };
-})
+});

-.directive('scrollYOffsetElement', ['$anchorScroll', function($anchorScroll) {
-  return function(scope, element) {
-    $anchorScroll.yOffset = element;
-  };
-}]);
@@ -6,34 +6,87 @@ angular.module('DocsController', [])
  function($scope, $rootScope, $location, $window, $cookies, openPlunkr,
              NG_PAGES, NG_NAVIGATION, NG_VERSION) {

+
  $scope.openPlunkr = openPlunkr;

  $scope.docsVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.version;

+  $scope.fold = function(url) {
+    if(url) {
+      $scope.docs_fold = '/notes/' + url;
+      if(/\/build/.test($window.location.href)) {
+        $scope.docs_fold = '/build/docs' + $scope.docs_fold;
+      }
+      window.scrollTo(0,0);
+    }
+    else {
+      $scope.docs_fold = null;
+    }
+  };
+  var OFFLINE_COOKIE_NAME = 'ng-offline',
+      INDEX_PATH = /^(\/|\/index[^\.]*.html)$/;
+
+
+  /**********************************
+   Publish methods
+   ***********************************/
+
  $scope.navClass = function(navItem) {
    return {
-      active: navItem.href && this.currentPage && this.currentPage.path,
-      current: this.currentPage && this.currentPage.path === navItem.href,
+      active: navItem.href && this.currentPage.path,
      'nav-index-section': navItem.type === 'section'
    };
  };

-
-
-  $scope.$on('$includeContentLoaded', function() {
+  $scope.afterPartialLoaded = function() {
    var pagePath = $scope.currentPage ? $scope.currentPage.path : $location.path();
    $window._gaq.push(['_trackPageview', pagePath]);
-  });
+  };
+
+  /** stores a cookie that is used by apache to decide which manifest ot send */
+  $scope.enableOffline = function() {
+    //The cookie will be good for one year!
+    var date = new Date();
+    date.setTime(date.getTime()+(365*24*60*60*1000));
+    var expires = "; expires="+date.toGMTString();
+    var value = angular.version.full;
+    document.cookie = OFFLINE_COOKIE_NAME + "="+value+expires+"; path=" + $location.path;
+
+    //force the page to reload so server can serve new manifest file
+    window.location.reload(true);
+  };
+
+
+
+  /**********************************
+   Watches
+   ***********************************/
+

  $scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {

-    path = path.replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
+    var currentPage = $scope.currentPage = NG_PAGES[path];
+    if ( !currentPage && path.charAt(0)==='/' ) {
+      // Strip off leading slash
+      path = path.substr(1);
+    }
+
+    currentPage = $scope.currentPage = NG_PAGES[path];
+    if ( !currentPage && path.charAt(path.length-1) === '/' && path.length > 1 ) {
+      // Strip off trailing slash
+      path = path.substr(0, path.length-1);
+    }
+
+    currentPage = $scope.currentPage = NG_PAGES[path];
+    if ( !currentPage && /\/index$/.test(path) ) {
+      // Strip off index from the end
+      path = path.substr(0, path.length - 6);
+    }

    currentPage = $scope.currentPage = NG_PAGES[path];

    if ( currentPage ) {
-      $scope.partialPath = 'partials/' + path + '.html';
-      $scope.currentArea = NG_NAVIGATION[currentPage.area];
+      $scope.currentArea = currentPage && NG_NAVIGATION[currentPage.area];
      var pathParts = currentPage.path.split('/');
      var breadcrumb = $scope.breadcrumb = [];
      var breadcrumbPath = '';
@@ -45,7 +98,6 @@ angular.module('DocsController', [])
    } else {
      $scope.currentArea = NG_NAVIGATION['api'];
      $scope.breadcrumb = [];
-      $scope.partialPath = 'Error404.html';
    }
  });

@@ -55,12 +107,24 @@ angular.module('DocsController', [])

  $scope.versionNumber = angular.version.full;
  $scope.version = angular.version.full + "  " + angular.version.codeName;
+  $scope.subpage = false;
+  $scope.offlineEnabled = ($cookies[OFFLINE_COOKIE_NAME] == angular.version.full);
+  $scope.futurePartialTitle = null;
  $scope.loading = 0;
+  $scope.$cookies = $cookies;

+  $cookies.platformPreference = $cookies.platformPreference || 'gitUnix';

-  var INDEX_PATH = /^(\/|\/index[^\.]*.html)$/;
  if (!$location.path() || INDEX_PATH.test($location.path())) {
    $location.path('/api').replace();
  }

+  // bind escape to hash reset callback
+  angular.element(window).on('keydown', function(e) {
+    if (e.keyCode === 27) {
+      $scope.$apply(function() {
+        $scope.subpage = false;
+      });
+    }
+  });
 }]);
@@ -0,0 +1,24 @@
+angular.module('docsApp.navigationService', [])
+
+.factory('navigationService', function($window) {
+  var service = {
+    currentPage: null,
+    currentVersion: null,
+    changePage: function(newPage) {
+
+    },
+    changeVersion: function(newVersion) {
+
+      //TODO =========
+    //   var currentPagePath = '';
+
+    // // preserve URL path when switching between doc versions
+    // if (angular.isObject($rootScope.currentPage) && $rootScope.currentPage.section && $rootScope.currentPage.id) {
+    //   currentPagePath = '/' + $rootScope.currentPage.section + '/' + $rootScope.currentPage.id;
+    // }
+
+    // $window.location = version.url + currentPagePath;
+
+    }
+  };
+});
@@ -10,45 +10,28 @@ angular.module('search', [])
  $scope.search = function(q) {
    var MIN_SEARCH_LENGTH = 2;
    if(q.length >= MIN_SEARCH_LENGTH) {
-      docsSearch(q).then(function(hits) {
-        var results = {};
-        angular.forEach(hits, function(hit) {
-          var area = hit.area;
-
-          var limit = (area == 'api') ? 40 : 14;
-          results[area] = results[area] || [];
-          if(results[area].length < limit) {
-            results[area].push(hit);
-          }
-        });
-
-        var totalAreas = 0;
-        for(var i in results) {
-          ++totalAreas;
-        }
-        if(totalAreas > 0) {
-          $scope.colClassName = 'cols-' + totalAreas;
-        }
-        $scope.hasResults = totalAreas > 0;
-        $scope.results = results;
-      });
+      var results = docsSearch(q);
+      var totalAreas = 0;
+      for(var i in results) {
+        ++totalAreas;
+      }
+      if(totalAreas > 0) {
+        $scope.colClassName = 'cols-' + totalAreas;
+      }
+      $scope.hasResults = totalAreas > 0;
+      $scope.results = results;
    }
    else {
      clearResults();
    }
    if(!$scope.$$phase) $scope.$apply();
  };
-
  $scope.submit = function() {
    var result;
-    if ($scope.results.api) {
-      result = $scope.results.api[0];
-    } else {
-      for(var i in $scope.results) {
-        result = $scope.results[i][0];
-        if(result) {
-          break;
-        }
+    for(var i in $scope.results) {
+      result = $scope.results[i][0];
+      if(result) {
+        break;
      }
    }
    if(result) {
@@ -56,125 +39,79 @@ angular.module('search', [])
      $scope.hideResults();
    }
  };
-
  $scope.hideResults = function() {
    clearResults();
    $scope.q = '';
  };
 }])

-
-.controller('Error404SearchCtrl', ['$scope', '$location', 'docsSearch',
-        function($scope, $location, docsSearch) {
-  docsSearch($location.path().split(/[\/\.:]/).pop()).then(function(results) {
-    $scope.results = {};
-    angular.forEach(results, function(result) {
-      var area = $scope.results[result.area] || [];
-      area.push(result);
-      $scope.results[result.area] = area;
-    });
-  });
+.controller('Error404SearchCtrl', ['$scope', '$location', 'docsSearch', function($scope, $location, docsSearch) {
+  $scope.results = docsSearch($location.path().split(/[\/\.:]/).pop());
 }])

+.factory('lunrSearch', function() {
+  return function(properties) {
+    if (window.RUNNING_IN_NG_TEST_RUNNER) return null;

-.provider('docsSearch', function() {
-
-  // This version of the service builds the index in the current thread,
-  // which blocks rendering and other browser activities.
-  // It should only be used where the browser does not support WebWorkers
-  function localSearchFactory($http, $timeout, NG_PAGES) {
-
-    console.log('Using Local Search Index');
-
-    // Create the lunr index
-    var index = lunr(function() {
-      this.ref('path');
-      this.field('titleWords', {boost: 50});
-      this.field('members', { boost: 40});
-      this.field('keywords', { boost : 20 });
-    });
-
-    // Delay building the index by loading the data asynchronously
-    var indexReadyPromise = $http.get('js/search-data.json').then(function(response) {
-      var searchData = response.data;
-      // Delay building the index for 500ms to allow the page to render
-      return $timeout(function() {
-        // load the page data into the index
-        angular.forEach(searchData, function(page) {
-          index.add(page);
-        });
-      }, 500);
-    });
-
-    // The actual service is a function that takes a query string and
-    // returns a promise to the search results
-    // (In this case we just resolve the promise immediately as it is not
-    // inherently an async process)
-    return function(q) {
-      return indexReadyPromise.then(function() {
-        var hits = index.search(q);
-        var results = [];
-        angular.forEach(hits, function(hit) {
-          results.push(NG_PAGES[hit.ref]);
-        });
-        return results;
-      });
+    var engine = lunr(properties);
+    return {
+      store : function(values) {
+        engine.add(values);
+      },
+      search : function(q) {
+        return engine.search(q);
+      }
    };
-  }
-  localSearchFactory.$inject = ['$http', '$timeout', 'NG_PAGES'];
-
-  // This version of the service builds the index in a WebWorker,
-  // which does not block rendering and other browser activities.
-  // It should only be used where the browser does support WebWorkers
-  function webWorkerSearchFactory($q, $rootScope, NG_PAGES) {
-
-    console.log('Using WebWorker Search Index')
-
-    var searchIndex = $q.defer();
-    var results;
-
-    var worker = new 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
-    // - when it has completed a search query and the results are available
-    worker.onmessage = function(oEvent) {
-      $rootScope.$apply(function() {
-
-        switch(oEvent.data.e) {
-          case 'index-ready':
-            searchIndex.resolve();
-            break;
-          case 'query-ready':
-            var pages = oEvent.data.d.map(function(path) {
-              return NG_PAGES[path];
-            });
-            results.resolve(pages);
-            break;
-        }
-      });
-    };
-
-    // The actual service is a function that takes a query string and
-    // returns a promise to the search results
-    return function(q) {
-
-      // We only run the query once the index is ready
-      return searchIndex.promise.then(function() {
-
-        results = $q.defer();
-        worker.postMessage({ q: q });
-        return results.promise;
-      });
-    };
-  }
-  webWorkerSearchFactory.$inject = ['$q', '$rootScope', 'NG_PAGES'];
-
-  return {
-    $get: window.Worker ? webWorkerSearchFactory : localSearchFactory
  };
 })

+.factory('docsSearch', ['$rootScope','lunrSearch', 'NG_PAGES',
+    function($rootScope, lunrSearch, NG_PAGES) {
+  if (window.RUNNING_IN_NG_TEST_RUNNER) {
+    return null;
+  }
+
+  var index = lunrSearch(function() {
+    this.ref('id');
+    this.field('title', {boost: 50});
+    this.field('members', { boost: 40});
+    this.field('keywords', { boost : 20 });
+  });
+
+  angular.forEach(NG_PAGES, function(page, key) {
+    if(page.searchTerms) {
+      index.store({
+        id : key,
+        title : page.searchTerms.titleWords,
+        keywords : page.searchTerms.keywords,
+        members : page.searchTerms.members
+      });
+    };
+  });
+
+  return function(q) {
+    var results = {
+      api : [],
+      tutorial : [],
+      guide : [],
+      error : [],
+      misc : []
+    };
+    angular.forEach(index.search(q), function(result) {
+      var key = result.ref;
+      var item = NG_PAGES[key];
+      var area = item.area;
+      item.path = key;
+
+      var limit = area == 'api' ? 40 : 14;
+      if(results[area].length < limit) {
+        results[area].push(item);
+      }
+    });
+    return results;
+  };
+}])
+
 .directive('focused', function($timeout) {
  return function(scope, element, attrs) {
    element[0].focus();
@@ -196,7 +133,7 @@ angular.module('search', [])
  return function(scope, element, attrs) {
    var ESCAPE_KEY_KEYCODE = 27,
        FORWARD_SLASH_KEYCODE = 191;
-    angular.element($document[0].body).on('keydown', function(event) {
+    angular.element($document[0].body).bind('keydown', function(event) {
      var input = element[0];
      if(event.keyCode == FORWARD_SLASH_KEYCODE && document.activeElement != input) {
        event.stopPropagation();
@@ -205,7 +142,7 @@ angular.module('search', [])
      }
    });

-    element.on('keydown', function(event) {
+    element.bind('keydown', function(event) {
      if(event.keyCode == ESCAPE_KEY_KEYCODE) {
        event.stopPropagation();
        event.preventDefault();
@@ -1,6 +1,6 @@
 angular.module('tutorials', [])

-.directive('docTutorialNav', function() {
+.directive('docTutorialNav', function(templateMerge) {
  var pages = [
    '',
    'step_00', 'step_01', 'step_02', 'step_03', 'step_04',
@@ -8,22 +8,23 @@ angular.module('tutorials', [])
    'step_10', 'step_11', 'step_12', 'the_end'
  ];
  return {
-    scope: {},
-    template:
-      '<a ng-href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
-      '<a ng-href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
-      '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
-      '<a ng-href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>',
-    link: function(scope, element, attrs) {
-      var seq = 1 * attrs.docTutorialNav;
-      scope.seq = seq;
-      scope.prev = pages[seq];
-      scope.next = pages[2 + seq];
-      scope.diffLo = seq ? (seq - 1): '0~1';
-      scope.diffHi = seq;
+    compile: function(element, attrs) {
+      var seq = 1 * attrs.docTutorialNav,
+          props = {
+            seq: seq,
+            prev: pages[seq],
+            next: pages[2 + seq],
+            diffLo: seq ? (seq - 1): '0~1',
+            diffHi: seq
+          };

      element.addClass('btn-group');
      element.addClass('tutorial-nav');
+      element.append(templateMerge(
+        '<a href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
+        '<a href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
+        '<a href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
+        '<a href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>', props));
    }
  };
 })
@@ -46,4 +47,4 @@ angular.module('tutorials', [])
        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}">GitHub</a>\n' +
      '</p>'
  };
-});
+});
@@ -4,7 +4,6 @@ angular.module('versions', [])

 .controller('DocsVersionsCtrl', ['$scope', '$location', '$window', 'NG_VERSIONS', function($scope, $location, $window, NG_VERSIONS) {
  $scope.docs_version  = NG_VERSIONS[0];
-  $scope.docs_versions = NG_VERSIONS;

  for(var i=0, minor = NaN; i < NG_VERSIONS.length; i++) {
    var version = NG_VERSIONS[i];
@@ -16,12 +15,13 @@ angular.module('versions', [])
    minor = version.minor;
  }

+  $scope.docs_versions = NG_VERSIONS;
  $scope.getGroupName = function(v) {
-    return v.isLatest ? 'Latest' : ('v' + v.major + '.' + v.minor + '.x');
+    return v.isLatest ? 'Latest' : (v.isStable ? 'Stable' : 'Unstable');
  };

  $scope.jumpToDocsVersion = function(version) {
-    var currentPagePath = $location.path().replace(/\/$/, '');
+    var currentPagePath = $location.path();

    // TODO: We need to do some munging of the path for different versions of the API...

@@ -1,38 +0,0 @@
-describe("code", function() {
-  var prettyPrintOne, oldPP;
-  var compile, scope;
-
-  var any = jasmine.any;
-
-  beforeEach(module('directives'));
-
-  beforeEach(inject(function($rootScope, $compile) {
-    // Provide stub for pretty print function
-    oldPP = window.prettyPrintOne;
-    prettyPrintOne = window.prettyPrintOne = jasmine.createSpy();
-
-    scope = $rootScope.$new();
-    compile = $compile;
-  }));
-
-  afterEach(function() {
-    window.prettyPrintOne = oldPP;
-  });
-
-
-  it('should pretty print innerHTML', function() {
-    compile('<code>var x;</code>')(scope);
-    expect(prettyPrintOne).toHaveBeenCalledWith('var x;', null, false);
-  });
-
-  it('should allow language declaration', function() {
-    compile('<code class="lang-javascript"></code>')(scope);
-    expect(prettyPrintOne).toHaveBeenCalledWith(any(String), 'javascript', false);
-  });
-
-  it('supports allow line numbers', function() {
-    compile('<code class="linenum"></code>')(scope);
-    expect(prettyPrintOne).toHaveBeenCalledWith(any(String), null, true);
-  });
-});
-
@@ -19,7 +19,7 @@ describe("DocsController", function() {
    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');
+      $scope.afterPartialLoaded();
      expect($window._gaq.pop()).toEqual(['_trackPageview', 'a/b/c']);
    }));

@@ -27,7 +27,7 @@ describe("DocsController", function() {
    it("should update the Google Analytics with $location.path if currentPage is missing", inject(function($window, $location) {
      $window._gaq = [];
      spyOn($location, 'path').andReturn('x/y/z');
-      $scope.$broadcast('$includeContentLoaded');
+      $scope.afterPartialLoaded();
      expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']);
    }));
  });
@@ -5,8 +5,8 @@ var packagePath = __dirname;

 var Package = require('dgeni').Package;

-// Create and export a new Dgeni package called angularjs. This package depends upon
-// the ngdoc,nunjucks and examples packages defined in the dgeni-packages npm module.
+// Create and export a new Dgeni package called dgeni-example. This package depends upon
+// the jsdoc and nunjucks packages defined in the dgeni-packages npm module.
 module.exports = new Package('angularjs', [
  require('dgeni-packages/ngdoc'),
  require('dgeni-packages/nunjucks'),
@@ -92,7 +92,10 @@ module.exports = new Package('angularjs', [
      }
      return docPath;
    },
-    outputPathTemplate: 'partials/${path}.html'
+    getOutputPath: function(doc) {
+      return 'partials/' + doc.path +
+          ( doc.fileInfo.baseName === 'index' ? '/index.html' : '.html');
+    }
  });

  computePathsProcessor.pathTemplates.push({
@@ -103,20 +106,10 @@ module.exports = new Package('angularjs', [

  computePathsProcessor.pathTemplates.push({
    docTypes: ['indexPage'],
-    pathTemplate: '.',
+    getPath: function() {},
    outputPathTemplate: '${id}.html'
  });

-  computePathsProcessor.pathTemplates.push({
-    docTypes: ['module' ],
-    pathTemplate: '${area}/${name}',
-    outputPathTemplate: 'partials/${area}/${name}.html'
-  });
-  computePathsProcessor.pathTemplates.push({
-    docTypes: ['componentGroup' ],
-    pathTemplate: '${area}/${moduleName}/${groupType}',
-    outputPathTemplate: 'partials/${area}/${moduleName}/${groupType}.html'
-  });

  computeIdsProcessor.idTemplates.push({
    docTypes: ['overview', 'tutorial', 'e2e-test', 'indexPage'],
@@ -131,12 +124,6 @@ module.exports = new Package('angularjs', [
  });
 })

-.config(function(checkAnchorLinksProcessor) {
-  checkAnchorLinksProcessor.base = '/';
-  // We are only interested in docs that have an area (i.e. they are pages)
-  checkAnchorLinksProcessor.checkDoc = function(doc) { return doc.area; };
-})
-

 .config(function(
  generateIndexPagesProcessor,
@@ -157,8 +144,6 @@ module.exports = new Package('angularjs', [
    jqueryDeployment
  ];

-  generateProtractorTestsProcessor.basePath = 'build/docs/';
-
  generateExamplesProcessor.deployments = [
    debugDeployment,
    defaultDeployment,
@@ -147,18 +147,24 @@ module.exports = function generatePagesDataProcessor(log) {
  };

  return {
-    $runAfter: ['paths-computed', 'generateKeywordsProcessor'],
+    $runAfter: ['paths-computed'],
    $runBefore: ['rendering-docs'],
    $process: function(docs) {

-      // We are only interested in docs that are in an area
-      var pages = _.filter(docs, function(doc) {
-        return doc.area;
+      _(docs)
+      .filter(function(doc) { return doc.area === 'api' && doc.docType === 'module'; })
+      .forEach(function(doc) { if ( !doc.path ) {
+        log.warn('Missing path property for ', doc.id);
+      }})
+      .map(function(doc) { return _.pick(doc, ['id', 'module', 'docType', 'area']); })
+      .tap(function(docs) {
+        log.debug(docs);
      });

-      // We are only interested in pages that are not landing pages
-      var navPages = _.filter(pages, function(page) {
-        return page.docType != 'componentGroup';
+
+      // We are only interested in docs that are in an area and are not landing pages
+      var navPages = _.filter(docs, function(page) {
+        return page.area && page.docType != 'componentGroup';
      });

      // Generate an object collection of pages that is grouped by area e.g.
@@ -192,48 +198,28 @@ module.exports = function generatePagesDataProcessor(log) {
          area.navGroups = navGroupMapper(pages, area);
        });

-      docs.push({
-        docType: 'nav-data',
-        id: 'nav-data',
-        template: 'nav-data.template.js',
-        outputPath: 'js/nav-data.js',
-        areas: areas
-      });
-
-
-
-      var searchData = _(pages)
-        .filter(function(page) {
-            return page.searchTerms;
-        })
-        .map(function(page) {
-          return _.extend({ path: page.path }, page.searchTerms);
-        })
-        .value();
-
-      docs.push({
-        docType: 'json-doc',
-        id: 'search-data-json',
-        template: 'json-doc.template.json',
-        outputPath: 'js/search-data.json',
-        data: searchData
-      });
-
      // Extract a list of basic page information for mapping paths to partials and for client side searching
-      var pageData = _(docs)
+      var pages = _(docs)
        .map(function(doc) {
-          return _.pick(doc, ['name', 'area', 'path']);
+          var page = _.pick(doc, [
+            'docType', 'id', 'name', 'area', 'outputPath', 'path', 'searchTerms'
+          ]);
+          return page;
        })
        .indexBy('path')
        .value();

-      docs.push({
+      var docData = {
        docType: 'pages-data',
        id: 'pages-data',
        template: 'pages-data.template.js',
        outputPath: 'js/pages-data.js',
-        pages: pageData
-      });
+
+        areas: areas,
+        pages: pages
+      };
+
+      docs.push(docData);
    }
-  };
+  }
 };
@@ -19,13 +19,13 @@ module.exports = function debugDeployment(getVersion) {
      '../angular-animate.js',
      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
      'js/angular-bootstrap/dropdown-toggle.js',
      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
      'js/versions-data.js',
      'js/pages-data.js',
-      'js/nav-data.js',
      'js/docs.js'
    ],
    stylesheets: [
@@ -18,15 +18,15 @@ module.exports = function defaultDeployment(getVersion) {
      '../angular-touch.min.js',
      '../angular-animate.min.js',
      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
-      'js/angular-bootstrap/bootstrap.min.js',
-      'js/angular-bootstrap/dropdown-toggle.min.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
      'js/versions-data.js',
      'js/pages-data.js',
-      'js/nav-data.js',
-      'js/docs.min.js'
+      'js/docs.js'
    ],
    stylesheets: [
      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
@@ -22,15 +22,15 @@ module.exports = function jqueryDeployment(getVersion) {
      '../angular-touch.min.js',
      '../angular-animate.min.js',
      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
-      'js/angular-bootstrap/bootstrap.min.js',
-      'js/angular-bootstrap/dropdown-toggle.min.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
      'js/versions-data.js',
      'js/pages-data.js',
-      'js/nav-data.js',
-      'js/docs.min.js'
+      'js/docs.js'
    ],
    stylesheets: [
      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
@@ -21,15 +21,15 @@ module.exports = function productionDeployment(getVersion) {
      cdnUrl + '/angular-touch.min.js',
      cdnUrl + '/angular-animate.min.js',
      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
-      'js/angular-bootstrap/bootstrap.min.js',
-      'js/angular-bootstrap/dropdown-toggle.min.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
      'js/versions-data.js',
      'js/pages-data.js',
-      'js/nav-data.js',
-      'js/docs.min.js'
+      'js/docs.js'
    ],
    stylesheets: [
      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
@@ -1,5 +1,6 @@
 "use strict";

+var gruntUtils = require('../../../lib/grunt/utils');
 var versionInfo = require('../../../lib/versions/version-info');

 /**
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" ng-app="docsApp" ng-strict-di ng-controller="DocsController">
+<html lang="en" ng-app="docsApp" ng-controller="DocsController">
 <head>
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta charset="utf-8">
@@ -56,6 +56,15 @@
      }
    })();

+
+    // force page reload when new update is available
+    window.applicationCache && window.applicationCache.addEventListener('updateready', function(e) {
+      if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
+        window.applicationCache.swapCache();
+        window.location.reload();
+      }
+    }, false);
+
    // GA asynchronous tracker
    var _gaq = _gaq || [];
    _gaq.push(['_setAccount', 'UA-8594346-3']);
@@ -70,13 +79,13 @@
 </head>
 <body>
  <div id="wrapper">
-    <header scroll-y-offset-element class="header header-fixed">
+    <header class="header header-fixed">
      <section class="navbar navbar-inverse docs-navbar-primary" ng-controller="DocsSearchCtrl">
        <div class="container">
          <div class="row">
            <div class="col-md-9 header-branding">
              <a class="brand navbar-brand" href="http://angularjs.org">
-                <img width="117" height="30" class="logo" ng-src="img/angularjs-for-header-only.svg">
+                <img class="logo" src="img/angularjs-for-header-only.svg">
              </a>
              <ul class="nav navbar-nav">
                <li class="divider-vertical"></li>
@@ -146,6 +155,9 @@
        </div>
        <div class="search-results-container" ng-show="hasResults">
          <div class="container">
+            <a href="" ng-click="hideResults()" class="search-close">
+              <span class="glyphicon glyphicon-remove search-close-icon"></span> Close
+            </a>
            <div class="search-results-frame">
              <div ng-repeat="(key, value) in results" class="search-results-group" ng-class="colClassName + ' col-group-' + key">
                <h4 class="search-results-group-heading">{{ key }}</h4>
@@ -156,9 +168,6 @@
                </div>
              </div>
            </div>
-            <a href="" ng-click="hideResults()" class="search-close">
-              <span class="glyphicon glyphicon-remove search-close-icon"></span> Close
-            </a>
          </div>
        </div>
      </section>
@@ -210,7 +219,7 @@
        </div>
        <div class="grid-right">
          <div id="loading" ng-show="loading">Loading...</div>
-          <div ng-hide="loading" ng-include="partialPath" autoscroll></div>
+          <div ng-hide="loading" ng-include="currentPage.outputPath || 'Error404.html'" onload="afterPartialLoaded()"  autoscroll></div>
        </div>
      </div>
    </section>
@@ -1 +0,0 @@
-{$ doc.data | json $}
@@ -1,3 +0,0 @@
-// Meta data used by the AngularJS docs app
-angular.module('navData', [])
-  .value('NG_NAVIGATION', {$ doc.areas | json $});
@@ -1,3 +1,4 @@
 // Meta data used by the AngularJS docs app
 angular.module('pagesData', [])
-  .value('NG_PAGES', {$ doc.pages | json $});
+  .value('NG_PAGES', {$ doc.pages | json $})
+  .value('NG_NAVIGATION', {$ doc.areas | json $});
@@ -9,14 +9,14 @@ The documentation is organized into **{@link guide/module modules}** which conta
 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.

 <div class="alert alert-info">
-**Angular Prefixes `$` and `$$`**:
+**Angular Namespaces `$` and `$$`**

 To prevent accidental name collisions with your code,
 Angular prefixes names of public objects with `$` and names of private objects with `$$`.
 Please do not use the `$` or `$$` prefix in your code.
 </div>

-## Angular Modules
+## Angular Namespace


 ## {@link ng ng (core module)}
@@ -148,7 +148,7 @@ or JavaScript callbacks.
      {@link ngAnimate CSS-based animations}
    </td>
    <td>
-      Follow ngAnimate’s CSS naming structure to reference CSS transitions / keyframe animations in AngularJS. Once defined, the animation can be triggered by referencing the CSS class within the HTML template code.
+      Follow ngAnimate’s CSS naming structure to reference CSS transitions / keyframe animations in AngularJS. Once defined the animation can be triggered by referencing the CSS class within the HTML template code.
    </td>
  </tr>
  <tr>
@@ -156,32 +156,11 @@ or JavaScript callbacks.
      {@link ngAnimate JS-based animations}
    </td>
    <td>
-      Use {@link angular.Module#animation module.animation()} to register a JavaScript animation. Once registered, the animation can be triggered by referencing the CSS class within the HTML template code.
+      Use {@link angular.Module#animation module.animation()} to register a JavaScript animation. Once registered the animation can be triggered by referencing the CSS class within the HTML template code.
    </td>
  </tr>
 </table>

-## {@link ngAria ngAria}
-
-Use ngAria to inject common accessibility attributes into directives and improve the experience for users with disabilities.
-
-<div class="alert alert-info">Include the **angular-aria.js** file and set ngAria as a dependency for this to work in your application.</div>
-
-<table class="definition-table spaced">
-  <tr>
-    <td>
-      {@link ngAria#service Services}
-    </td>
-    <td>
-      <p>
-          The {@link ngAria.$aria $aria} service contains helper methods for applying ARIA attributes to HTML.
-      <p>
-      <p>
-          {@link ngAria.$ariaProvider $ariaProvider} is used for configuring ARIA attributes.
-      </p>
-    </td>
-  </tr>
-</table>

 ## {@link ngResource ngResource}

@@ -263,7 +242,7 @@ Use ngSanitize to securely parse and manipulate HTML data in your application.
  </tr>
  <tr>
    <td>
-      {@link ngSanitize#filter Filters}
+      {@link ngTouch#filter Filters}
    </td>
    <td>
      The {@link ngSanitize.filter:linky linky filter} is used to turn URLs into HTML links within the provided string.
@@ -3,7 +3,7 @@
@fullName Missing Required Controller
@description

-This error occurs when {@link ng.$compile HTML compiler} tries to process a directive that specifies the {@link ng.$compile#directive-definition-object `require` option} in a {@link ng.$compile#comprehensive-directive-api directive definition},
+This error occurs when {@link ng.$compile HTML compiler} tries to process a directive that specifies the {@link ng.$compile#description_comprehensive-directive-api_directive-definition-object `require` option} in a {@link ng.$compile#description_comprehensive-directive-api directive definition},
 but the required directive controller is not present on the current DOM element (or its ancestor element, if `^` was specified).

 To resolve this error ensure that there is no typo in the required controller name and that the required directive controller is present on the current element.
@@ -21,5 +21,5 @@ myModule.directive('directiveName', function factory() {
 });
 ```

-Please refer to the {@link ng.$compile#directive-definition-object
+Please refer to the {@link ng.$compile#description_comprehensive-directive-api_directive-definition-object
 `scope` option} of the directive definition documentation to learn more about the API.
@@ -4,7 +4,7 @@
@description

 This error occurs when a directive defines an isolate scope property
-(using the `=` mode in the {@link ng.$compile#directive-definition-object
+(using the `=` mode in the {@link ng.$compile#description_comprehensive-directive-api_directive-definition-object
 `scope` option} of a directive definition) but the directive is used with an expression that is not-assignable.

 In order for the two-way data-binding to work, it must be possible to write new values back into the path defined with the expression.
@@ -12,10 +12,10 @@ $controller(MyController);
 $controller(MyController, {scope: newScope});
 ```

-To fix the example above please provide a scope (using the `$scope` property in the locals object) to the $controller call:
+To fix the example above please provide a scope to the $controller call:

 ```
-$controller(MyController, {$scope: newScope});
+$controller(MyController, {$scope, newScope});
 ```

 Please consult the {@link ng.$controller $controller} service api docs to learn more.
@@ -1,10 +0,0 @@
-@ngdoc error
-@name $http:badreq
-@fullName Bad Request Configuration
-@description
-
-This error occurs when the request configuration parameter passed to the {@link ng.$http `$http`} service is not an object.  `$http` expects a single parameter, the request configuration object, but received a parameter that was not an object.  The error message should provide additional context such as the actual value of the parameter that was received.  If you passed a string parameter, perhaps you meant to call one of the shorthand methods on `$http` such as `$http.get(…)`, etc.
-
-To resolve this error, make sure you pass a valid request configuration object to `$http`.
-
-For more information, see the {@link ng.$http `$http`} service API documentation.
@@ -0,0 +1,10 @@
+@ngdoc error
+@name $httpBackend:noxhr
+@fullName Unsupported XHR
+@description
+
+This error occurs in browsers that do not support XmlHttpRequest. AngularJS
+supports Safari, Chrome, Firefox, Opera, IE8 and higher, and mobile browsers
+(Android, Chrome Mobile, iOS Safari). To avoid this error, use an officially
+supported browser.
+
@@ -6,22 +6,6 @@
 This error occurs when a module fails to load due to some exception. The error
 message above should provide additional context.

-### Using `ngRoute`
-
 In AngularJS `1.2.0` and later, `ngRoute` has been moved to its own module.
-If you are getting this error after upgrading to `1.2.x` or later, be sure that you've
+If you are getting this error after upgrading to `1.2.x`, be sure that you've
 installed {@link ngRoute `ngRoute`}.
-
-### Monkey-patching Angular's `ng` module
-
-This error can also occur if you have tried to add your own components to the `ng` module.
-This has never been supported and from `1.3.0` it will actually trigger this error.
-For instance the following code could trigger this error.
-
-```js
-angular.module('ng').filter('tel', function (){});
-```
-
-Instead create your own module and add it as a dependency to your application's top-level module.
-See [#9692](https://github.com/angular/angular.js/issues/9692) and
-[#7709](https://github.com/angular/angular.js/issues/7709) for more information
@@ -1,54 +0,0 @@
-@ngdoc error
-@name $injector:strictdi
-@fullName Explicit annotation required
-@description
-
-This error occurs when attempting to invoke a function or provider which
-has not been explicitly annotated, while the application is running with
-strict-di mode enabled.
-
-For example:
-
-```
-angular.module("myApp", [])
-  // BadController cannot be invoked, because
-  // the dependencies to be injected are not
-  // explicitly listed.
-  .controller("BadController", function($scope, $http, $filter) {
-    // ...
-  });
-```
-
-To fix the error, explicitly annotate the function using either the inline
-bracket notation, or with the $inject property:
-
-```
-function GoodController1($scope, $http, $filter) {
-  // ...
-}
-GoodController1.$inject = ["$scope", "$http", "$filter"];
-
-angular.module("myApp", [])
-  // GoodController1 can be invoked because it
-  // had an $inject property, which is an array
-  // containing the dependency names to be
-  // injected.
-  .controller("GoodController1", GoodController1)
-
-  // GoodController2 can also be invoked, because
-  // the dependencies to inject are listed, in
-  // order, in the array, with the function to be
-  // invoked trailing on the end.
-  .controller("GoodController2", [
-    "$scope",
-    "$http",
-    "$filter",
-    function($scope, $http, $filter) {
-      // ...
-    }
-  ]);
-
-```
-
-For more information about strict-di mode, see {@link ng.directive:ngApp ngApp}
-and {@link angular.bootstrap angular.bootstrap}.
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`//Override me with ?jquery=/bower_components/jquery/dist/jquery.js`