feat(ngAria): add option to disable role=button

Closes #11580
Closes #12234

.bowerrc

@@ -1,4 +0,0 @@
-{
-  "directory": "bower_components",
-  "json": "bower.json"
-}

.editorconfig

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

.gitattributes

@@ -0,0 +1,5 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# JS files must always use LF for tools to work
+*.js eol=lf

.gitignore

@@ -1,4 +1,5 @@
 /build/
+/benchpress-build/
 .DS_Store
 gen_docs.disable
 test.disable
@@ -9,11 +10,12 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 /node_modules/
-/components/
-/bower_components/
+bower_components/
 angular.xcodeproj
 .idea
+*.iml
 .agignore
+.lvimrc
 libpeerconnection.log
 npm-debug.log
 /tmp/

.jscs.json

@@ -1,6 +0,0 @@
-{
-  "disallowKeywords": ["with"],
-  "disallowTrailingWhitespace": true,
-  "requireRightStickedOperators": ["!"],
-  "requireLeftStickedOperators": [","]
-}

.jscs.json.todo

@@ -1,19 +0,0 @@
-// This is an incomplete TODO list of checks we want to start enforcing
-//
-// The goal is to enable these checks one by one by moving them to .jscs.json along with commits
-// that correct the existing code base issues and make the new check pass.
-
-{
-  "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
-  }
-}

.jscsrc

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

.jshintignore

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

.jshintrc

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

.jshintrc-base

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

.travis.yml

@@ -1,6 +1,13 @@
 language: node_js
+sudo: false
 node_js:
-  - 0.10
+  - '0.10'
+
+cache:
+  directories:
+    - node_modules
+    - bower_components
+    - docs/bower_components
 
 branches:
   except:
@@ -8,23 +15,44 @@ branches:
 
 env:
   matrix:
-    - JOB=unit
-    - JOB=e2e TEST_TARGET=jqlite
-    - JOB=e2e TEST_TARGET=jquery
-    - JOB=e2e TEST_TARGET=doce2e
+    - JOB=unit BROWSER_PROVIDER=saucelabs
+    - JOB=docs-e2e 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=docs-e2e BROWSER_PROVIDER=browserstack
+    - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack
+    - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=browserstack
   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/sauce-connect-ready
+    - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
+
+matrix:
+  allow_failures:
+    - env: "JOB=unit BROWSER_PROVIDER=browserstack"
+    - env: "JOB=docs-e2e BROWSER_PROVIDER=browserstack"
+    - env: "JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack"
+    - env: "JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=browserstack"
 
 install:
-  - npm config set registry http://23.251.144.68
-  - npm install
+  # Check the size of caches
+  - du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || true
+  # - npm config set registry http://23.251.144.68
+  # Disable the spinner, it looks bad on Travis
+  - npm config set spin false
+  # Log HTTP requests
+  - npm config set loglevel http
+  - npm install -g npm@2.5
+  # Instal npm dependecies and ensure that npm cache is not stale
+  - scripts/npm/install-dependencies.sh
 
 before_script:
   - mkdir -p $LOGS_DIR
-  - ./lib/sauce/sauce_connect_setup.sh
+  - ./scripts/travis/start_browser_provider.sh
   - npm install -g grunt-cli
   - grunt package
   - ./scripts/travis/wait_for_browser_provider.sh

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-#Contributing to AngularJS
+# Contributing to AngularJS
 
 We'd love for you to contribute to our source code and to make AngularJS even better than it is
 today! Here are the guidelines we'd like you to follow:
@@ -44,8 +44,9 @@ project.
 
 
 ## <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.
 
@@ -53,7 +54,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.
+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.
 
 ## <a name="submit"></a> Submission Guidelines
 
@@ -65,13 +66,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)
 
@@ -86,7 +87,7 @@ Before you submit your pull request consider the following guidelines:
   that relates to your submission. You don't want to duplicate effort.
 * Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull
   requests. We cannot accept code without this.
-* Make your changes in a new git branch
+* Make your changes in a new git branch:
 
      ```shell
      git checkout -b my-fix-branch master
@@ -106,7 +107,7 @@ Before you submit your pull request consider the following guidelines:
      ```
   Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
 
-* Build your changes locally to ensure all the tests pass
+* Build your changes locally to ensure all the tests pass:
 
     ```shell
     grunt test
@@ -119,14 +120,14 @@ Before you submit your pull request consider the following guidelines:
     ```
 
 * In GitHub, send a pull request to `angular:master`.
-* If we suggest changes then 
+* If we suggest changes then:
   * Make the required updates.
   * Re-run the Angular test suite to ensure tests are still passing.
   * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
 
     ```shell
     git rebase master -i
-    git push -f
+    git push origin my-fix-branch -f
     ```
 
 That's it! Thank you for your contribution!
@@ -172,7 +173,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 prototypical
+    * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypal
       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
@@ -226,18 +227,18 @@ The subject contains succinct description of the change:
 * don't capitalize first letter
 * no dot (.) at the end
 
-###Body
+### Body
 Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes"
 The body should include the motivation for the change and contrast this with previous behavior.
 
-###Footer
+### Footer
 The footer should contain any information about **Breaking Changes** and is also the place to
 reference GitHub issues that this commit **Closes**.
 
 
 A detailed explanation can be found in this [document][commit-message-format].
 
-## <a name="cla"></a> Signing the CLA 
+## <a name="cla"></a> Signing the CLA
 
 Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code
 changes to be accepted, the CLA must be signed. It's a quick process, we promise!
@@ -252,7 +253,7 @@ You can find out more detailed information about contributing in the
 
 
 
-[Google Closure I18N library]: https://code.google.com/p/closure-library/source/browse/closure/goog/i18n/
+[Google Closure I18N library]: https://github.com/google/closure-library/tree/master/closure/goog/i18n
 [angular-dev]: https://groups.google.com/forum/?fromgroups#!forum/angular-dev
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
 [commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
@@ -270,6 +271,6 @@ You can find out more detailed information about contributing in the
 [ngDocs]: https://github.com/angular/angular.js/wiki/Writing-AngularJS-Documentation
 [plunker]: http://plnkr.co/edit
 [stackoverflow]: http://stackoverflow.com/questions/tagged/angularjs
-[unit-testing]: http://docs.angularjs.org/guide/dev_guide.unit-testing
+[unit-testing]: https://docs.angularjs.org/guide/unit-testing
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/CONTRIBUTING.md?pixel)](https://github.com/igrigorik/ga-beacon)

Gruntfile.js

@@ -1,32 +1,29 @@
+'use strict';
+
 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;
   var dist = 'angular-'+ NG_VERSION.full;
 
-  //global beforeEach
-  util.init();
-
-
   //config
   grunt.initConfig({
     NG_VERSION: NG_VERSION,
-
-    parallel: {
-      travis: {
-        tasks: [
-          util.parallelTask(['test:unit', 'test:promises-aplus', 'tests:docs'], {stream: true}),
-          util.parallelTask(['test:e2e'])
-        ]
+    bp_build: {
+      options: {
+        buildPath: 'build/benchmarks',
+        benchmarksPath: 'benchmarks'
       }
     },
 
@@ -38,13 +35,14 @@ 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 [
-              //uncomment to enable CSP
-              // util.csp(),
+              util.conditionalCsp(),
               util.rewrite(),
+              e2e.middleware(),
               connect.favicon('images/favicon.ico'),
-              connect.static(options.base),
-              connect.directory(options.base)
+              connect.static(base),
+              connect.directory(base)
             ];
           }
         }
@@ -57,6 +55,7 @@ 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
@@ -66,8 +65,10 @@ module.exports = function(grunt) {
 
                 next();
               },
+              util.conditionalCsp(),
+              e2e.middleware(),
               connect.favicon('images/favicon.ico'),
-              connect.static(options.base)
+              connect.static(base)
             ];
           }
         }
@@ -107,6 +108,9 @@ module.exports = function(grunt) {
       options: {
         jshintrc: true,
       },
+      node: {
+        files: { src: ['*.js', 'lib/**/*.js'] },
+      },
       tests: {
         files: { src: 'test/**/*.js' },
       },
@@ -122,6 +126,9 @@ module.exports = function(grunt) {
       ngLocale: {
         files: { src: 'src/ngLocale/**/*.js' },
       },
+      ngMessageFormat: {
+        files: { src: 'src/ngMessageFormat/**/*.js' },
+      },
       ngMessages: {
         files: { src: 'src/ngMessages/**/*.js' },
       },
@@ -142,13 +149,16 @@ module.exports = function(grunt) {
       },
       ngTouch: {
         files: { src: 'src/ngTouch/**/*.js' },
+      },
+      ngAria: {
+        files: {src: 'src/ngAria/**/*.js'},
       }
     },
 
     jscs: {
       src: ['src/**/*.js', 'test/**/*.js'],
       options: {
-        config: ".jscs.json"
+        config: ".jscsrc"
       }
     },
 
@@ -156,7 +166,7 @@ module.exports = function(grunt) {
       scenario: {
         dest: 'build/angular-scenario.js',
         src: [
-          'bower_components/jquery/jquery.js',
+          'bower_components/jquery/dist/jquery.js',
           util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular')
         ],
         styles: {
@@ -193,6 +203,10 @@ module.exports = function(grunt) {
         dest: 'build/angular-resource.js',
         src: util.wrap(files['angularModules']['ngResource'], 'module')
       },
+      messageformat: {
+        dest: 'build/angular-message-format.js',
+        src: util.wrap(files['angularModules']['ngMessageFormat'], 'module')
+      },
       messages: {
         dest: 'build/angular-messages.js',
         src: util.wrap(files['angularModules']['ngMessages'], 'module')
@@ -209,6 +223,10 @@ 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']
@@ -221,18 +239,35 @@ module.exports = function(grunt) {
       animate: 'build/angular-animate.js',
       cookies: 'build/angular-cookies.js',
       loader: 'build/angular-loader.js',
+      messageformat: 'build/angular-message-format.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'
+      sanitize: 'build/angular-sanitize.js',
+      aria: 'build/angular-aria.js'
     },
 
 
     "ddescribe-iit": {
       files: [
+        'src/**/*.js',
         'test/**/*.js',
-        '!test/ngScenario/DescribeSpec.js'
-      ]
+        '!test/ngScenario/DescribeSpec.js',
+        '!src/ng/directive/attrs.js', // legitimate xit here
+        '!src/ngScenario/**/*.js',
+        '!test/helpers/privateMocks*.js'
+      ],
+      options: {
+        disallowed: [
+          'iit',
+          'xit',
+          'tthey',
+          'xthey',
+          'ddescribe',
+          'xdescribe'
+        ]
+      }
     },
 
     "merge-conflict": {
@@ -256,18 +291,26 @@ module.exports = function(grunt) {
     compress: {
       build: {
         options: {archive: 'build/' + dist +'.zip', mode: 'zip'},
-        src: ['**'], cwd: 'build', expand: true, dot: true, dest: dist + '/'
+        src: ['**'],
+        cwd: 'build',
+        expand: true,
+        dot: true,
+        dest: dist + '/'
       }
     },
 
-    shell:{
-      "promises-aplus-tests":{
-        options:{
-          //stdout:true,
-          stderr:true,
-          failOnError:true
+    shell: {
+      "npm-install": {
+        command: path.normalize('scripts/npm/install-dependencies.sh')
+      },
+
+      "promises-aplus-tests": {
+        options: {
+          stdout: false,
+          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')
       }
     },
 
@@ -287,14 +330,18 @@ module.exports = function(grunt) {
     }
   });
 
+  // global beforeEach task
+  if (!process.env.TRAVIS) {
+    grunt.task.run('shell:npm-install');
+  }
 
   //alias tasks
   grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']);
   grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
   grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
-  grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
+  grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['build', 'tests:modules']);
   grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
-  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
+  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['test:jqlite', 'test:jquery', 'test:modules']);
   grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
   grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);
   grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']);

LICENSE

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

README.closure.md

@@ -1,8 +1,8 @@
 Using AngularJS with the Closure Compiler
 =========================================
 
-The Closure Compiler project contains externs definitions for AngularJS
-JavaScript in its `contrib/externs` directory.
+The Closure Compiler project contains definitions for the AngularJS JavaScript
+in its `contrib/externs` directory.
 
 The definitions contain externs for use with the Closure compiler (aka
 JSCompiler). Passing these files to the --externs parameter of a compiler

README.md

@@ -6,16 +6,17 @@ 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 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!
+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. Best of all?? It makes development fun!
 
 * Web site: http://angularjs.org
 * Tutorial: http://docs.angularjs.org/tutorial
 * API Docs: http://docs.angularjs.org/api
 * Developer Guide: http://docs.angularjs.org/guide
-* Contribution guidelines: http://docs.angularjs.org/misc/contribute
+* Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
 * Dashboard: http://dashboard.angularjs.org
 
 Building AngularJS
@@ -37,7 +38,7 @@ To execute end-to-end (e2e) tests, use:
     grunt test:e2e
 
 To learn more about the grunt tasks, run `grunt --help` and also read our
-[contribution guidelines](http://docs.angularjs.org/misc/contribute).
+[contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
 
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)

TRIAGING.md

@@ -26,7 +26,6 @@ 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?
@@ -34,9 +33,8 @@ This process based on the idea of minimizing user pain
     * Check if there are comments that link to a dupe. If so verify that this is indeed a dupe, [close it][], and go to the last step.
 1. Bugs:
     * Label `Type: Bug`
-    * Reproducible? - Steps to reproduce the bug are clear. If they are not,
+    * 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.
@@ -44,11 +42,11 @@ This process based on the idea of minimizing user pain
     * Label `needs: breaking change` - if needed
     * Label `needs: public api` - if the issue requires introduction of a new public API
 1. Label `browser: *` - if the issue **only** affects a certain browser
-1. Label `frequency: *` – How often does this issue come up? How many developers does this affect?
+1. Label `frequency: *` – How often does this issue come up? How many developers does this affect? Chose just one of the following:
     * low - obscure issue affecting a handful of developers
     * moderate - impacts a common usage pattern
     * high - impacts most or all Angular apps
-1. Label `severity: *` - How bad is the issue?
+1. Label `severity: *` - How bad is the issue? Chose just one of the following:
     * security issue
     * regression
     * memory leak
@@ -57,13 +55,16 @@ This process based on the idea of minimizing user pain
     * inconvenience - causes ugly/boilerplate code in apps
 1. Label `component: *`
     * 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 `PRs plz!` - These issues are good targets for PRs from the open source community. In addition to applying this label, you must:
+    * Leave a comment explaining the problem and solution so someone can easily finish it.
+    * Assign the issue to yourself.
+    * Give feedback on PRs addressing this issue.
+    * You are responsible for mentoring contributors helping with this issue.
 1. Label `origin: google` for issues from Google
-
 1. Assign a milestone:
-   * Backlog - triaged fixes and features, should be the default choice 
+   * Backlog - triaged fixes and features, should be the default choice
    * Current 1.x.y milestone (e.g. 1.3.0-beta-2) - regressions and urgent bugs only
-    
+
 
 1. Unassign yourself from the issue
 

angularFiles.js

@@ -1,8 +1,11 @@
-angularFiles = {
+'use strict';
+
+var angularFiles = {
   'angularSrc': [
     'src/minErr.js',
     'src/Angular.js',
     'src/loader.js',
+    'src/stringify.js',
     'src/AngularPublic.js',
     'src/jqLite.js',
     'src/apis.js',
@@ -32,9 +35,12 @@ 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',
+    'src/ng/cookieReader.js',
 
     'src/ng/filter.js',
     'src/ng/filter/filter.js',
@@ -44,10 +50,11 @@ angularFiles = {
 
     'src/ng/directive/directives.js',
     'src/ng/directive/a.js',
-    'src/ng/directive/booleanAttrs.js',
+    'src/ng/directive/attrs.js',
     'src/ng/directive/form.js',
     'src/ng/directive/input.js',
     'src/ng/directive/ngBind.js',
+    'src/ng/directive/ngChange.js',
     'src/ng/directive/ngClass.js',
     'src/ng/directive/ngCloak.js',
     'src/ng/directive/ngController.js',
@@ -56,7 +63,10 @@ angularFiles = {
     'src/ng/directive/ngIf.js',
     'src/ng/directive/ngInclude.js',
     'src/ng/directive/ngInit.js',
+    'src/ng/directive/ngList.js',
+    'src/ng/directive/ngModel.js',
     'src/ng/directive/ngNonBindable.js',
+    'src/ng/directive/ngOptions.js',
     'src/ng/directive/ngPluralize.js',
     'src/ng/directive/ngRepeat.js',
     'src/ng/directive/ngShowHide.js',
@@ -65,20 +75,41 @@ angularFiles = {
     'src/ng/directive/ngTransclude.js',
     'src/ng/directive/script.js',
     'src/ng/directive/select.js',
-    'src/ng/directive/style.js'
+    'src/ng/directive/style.js',
+    'src/ng/directive/validators.js'
   ],
 
   'angularLoader': [
+    'stringify.js',
     'src/minErr.js',
     'src/loader.js'
   ],
 
   'angularModules': {
     'ngAnimate': [
-      'src/ngAnimate/animate.js'
+      'src/ngAnimate/shared.js',
+      'src/ngAnimate/rafScheduler.js',
+      'src/ngAnimate/animateChildrenDirective.js',
+      'src/ngAnimate/animateCss.js',
+      'src/ngAnimate/animateCssDriver.js',
+      'src/ngAnimate/animateJs.js',
+      'src/ngAnimate/animateJsDriver.js',
+      'src/ngAnimate/animateQueue.js',
+      'src/ngAnimate/animateRunner.js',
+      'src/ngAnimate/animation.js',
+      'src/ngAnimate/module.js'
     ],
     'ngCookies': [
-      'src/ngCookies/cookies.js'
+      'src/ngCookies/cookies.js',
+      'src/ngCookies/cookieStore.js',
+      'src/ngCookies/cookieWriter.js'
+    ],
+    'ngMessageFormat': [
+      'src/ngMessageFormat/messageFormatCommon.js',
+      'src/ngMessageFormat/messageFormatSelector.js',
+      'src/ngMessageFormat/messageFormatInterpolationParts.js',
+      'src/ngMessageFormat/messageFormatParser.js',
+      'src/ngMessageFormat/messageFormatService.js'
     ],
     'ngMessages': [
       'src/ngMessages/messages.js'
@@ -104,6 +135,9 @@ angularFiles = {
       'src/ngTouch/directive/ngClick.js',
       'src/ngTouch/directive/ngSwipe.js'
     ],
+    'ngAria': [
+      'src/ngAria/aria.js'
+    ]
   },
 
   'angularScenario': [
@@ -137,17 +171,18 @@ angularFiles = {
     'test/ngRoute/**/*.js',
     'test/ngSanitize/**/*.js',
     'test/ngMock/*.js',
-    'test/ngTouch/**/*.js'
+    'test/ngTouch/**/*.js',
+    'test/ngAria/*.js'
   ],
 
   'karma': [
-    'bower_components/jquery/jquery.js',
+    'bower_components/jquery/dist/jquery.js',
     'test/jquery_remove.js',
     '@angularSrc',
     'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest',
+    '@angularTest'
   ],
 
   'karmaExclude': [
@@ -166,22 +201,24 @@ angularFiles = {
     '@angularSrcModules',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
+    'test/ngMessageFormat/*.js',
     'test/ngMock/*.js',
     'test/ngCookies/*.js',
     'test/ngRoute/**/*.js',
     'test/ngResource/*.js',
     'test/ngSanitize/**/*.js',
-    'test/ngTouch/**/*.js'
+    'test/ngTouch/**/*.js',
+    'test/ngAria/*.js'
   ],
 
   'karmaJquery': [
-    'bower_components/jquery/jquery.js',
+    'bower_components/jquery/dist/jquery.js',
     'test/jquery_alias.js',
     '@angularSrc',
     'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest',
+    '@angularTest'
   ],
 
   'karmaJqueryExclude': [
@@ -193,13 +230,15 @@ angularFiles = {
 
 angularFiles['angularSrcModules'] = [].concat(
   angularFiles['angularModules']['ngAnimate'],
+  angularFiles['angularModules']['ngMessageFormat'],
   angularFiles['angularModules']['ngMessages'],
   angularFiles['angularModules']['ngCookies'],
   angularFiles['angularModules']['ngResource'],
   angularFiles['angularModules']['ngRoute'],
   angularFiles['angularModules']['ngSanitize'],
   angularFiles['angularModules']['ngMock'],
-  angularFiles['angularModules']['ngTouch']
+  angularFiles['angularModules']['ngTouch'],
+  angularFiles['angularModules']['ngAria']
 );
 
 if (exports) {

benchmarks/README.md

@@ -0,0 +1,6 @@
+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>`

benchmarks/event-delegation-bp/app.js

@@ -0,0 +1,57 @@
+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();
+    }
+  });
+});

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

@@ -0,0 +1,10 @@
+module.exports = function(config) {
+  config.set({
+    scripts: [{
+      id: 'angular',
+      src: '/build/angular.js'
+    },{
+      src: 'app.js',
+    }]
+  });
+};

benchmarks/event-delegation-bp/main.html

@@ -0,0 +1,139 @@
+<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>

benchmarks/largetable-bp/app.js

@@ -0,0 +1,183 @@
+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);
+    }
+  };
+});
+
+ */

benchmarks/largetable-bp/bp.conf.js

@@ -0,0 +1,15 @@
+module.exports = function(config) {
+  config.set({
+    scripts: [{
+      id: 'jquery',
+      src: 'jquery-noop.js'
+    },
+    {
+      id: 'angular',
+      src: '/build/angular.js'
+    },
+    {
+      src: 'app.js',
+    }]
+  });
+};

benchmarks/largetable-bp/jquery-noop.js

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

benchmarks/largetable-bp/main.html

@@ -0,0 +1,106 @@
+<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>interpolation + bind-once: <input type="radio" ng-model="benchmarkType" value="bindOnceInterpolation"></div>
+      <div>attribute interpolation: <input type="radio" ng-model="benchmarkType" value="interpolationAttr"></div>
+      <div>ngBind + fnInvocation: <input type="radio" ng-model="benchmarkType" value="ngBindFn"></div>
+      <div>interpolation + fnInvocation: <input type="radio" ng-model="benchmarkType" value="interpolationFn"></div>
+      <div>ngBind + filter: <input type="radio" ng-model="benchmarkType" value="ngBindFilter"></div>
+      <div>interpolation + filter: <input type="radio" ng-model="benchmarkType" value="interpolationFilter"></div>
+      <div>ngModel (const name): <input type="radio" ng-model="benchmarkType" value="ngModelConstName"></div>
+      <div>ngModel (interp name): <input type="radio" ng-model="benchmarkType" value="ngModelInterpName"></div>
+
+      <ng-switch on="benchmarkType">
+        <baseline-binding-table ng-switch-when="baselineBinding">
+        </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="bindOnceInterpolation">
+          <h2>baseline one-time 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>
+        <div ng-switch-when="ngModelConstName">
+          <h2>ngModel (const name)</h2>
+          <div ng-repeat="row in data">
+            <input type="text" ng-model="row.i" name="constName" />
+            <input type="text" ng-model="row.j" />
+          </div>
+        </div>
+        <div ng-switch-when="ngModelInterpName">
+          <h2>ngModel (interp name)</h2>
+          <div ng-repeat="(rowIdx, row) in data">
+            <input type="text" ng-model="row.i" name="input-{{rowIdx}}" />
+            <input type="text" ng-model="row.j" name="input2-{{rowIdx}}" />
+          </div>
+        </div>
+      </ng-switch>
+    </div>
+  </div>
+</div>

benchmarks/ng-options-bp/app.js

@@ -0,0 +1,95 @@
+"use strict";
+
+/* globals angular, benchmarkSteps */
+
+var app = angular.module('ngOptionsBenchmark', []);
+
+app.config(function($compileProvider) {
+  if ($compileProvider.debugInfoEnabled) {
+    $compileProvider.debugInfoEnabled(false);
+  }
+});
+
+
+
+app.controller('DataController', function($scope, $element) {
+  $scope.items = [];
+  $scope.count = 10000;
+
+  function changeOptions() {
+    $scope.items = [];
+    for (var i = 0; i < $scope.count; ++i) {
+      $scope.items.push({
+        id: i,
+        label: 'item-' + i,
+        group: 'group-' + i % 100
+      });
+    }
+  }
+
+  var selectElement = $element.find('select');
+  console.log(selectElement);
+
+
+  benchmarkSteps.push({
+    name: 'add-options',
+    fn: function() {
+      $scope.$apply(function() {
+        $scope.count = 10000;
+        changeOptions();
+      });
+    }
+  });
+
+  benchmarkSteps.push({
+    name: 'set-model-1',
+    fn: function() {
+      $scope.$apply(function() {
+        $scope.x = $scope.items[1000];
+      });
+    }
+  });
+
+  benchmarkSteps.push({
+    name: 'set-model-2',
+    fn: function() {
+      $scope.$apply(function() {
+        $scope.x = $scope.items[10];
+      });
+    }
+  });
+
+  benchmarkSteps.push({
+    name: 'remove-options',
+    fn: function() {
+      $scope.count = 100;
+      changeOptions();
+    }
+  });
+
+  benchmarkSteps.push({
+    name: 'add-options',
+    fn: function() {
+      $scope.$apply(function() {
+        $scope.count = 10000;
+        changeOptions();
+      });
+    }
+  });
+
+  benchmarkSteps.push({
+    name: 'set-view-1',
+    fn: function() {
+      selectElement.val('2000');
+      selectElement.triggerHandler('change');
+    }
+  });
+
+  benchmarkSteps.push({
+    name: 'set-view-2',
+    fn: function() {
+      selectElement.val('1000');
+      selectElement.triggerHandler('change');
+    }
+  });
+});

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

@@ -0,0 +1,11 @@
+module.exports = function(config) {
+  config.set({
+    scripts: [    {
+      id: 'angular',
+      src: '/build/angular.js'
+    },
+    {
+      src: 'app.js',
+    }]
+  });
+};

benchmarks/ng-options-bp/main.html

@@ -0,0 +1,10 @@
+<div ng-app="ngOptionsBenchmark" ng-cloak>
+  <div ng-controller="DataController">
+    <div class="container-fluid">
+      <p>
+        Tests the execution of ng-options for rendering during model and option updates.
+      </p>
+      <select ng-model="x" ng-options="a as a.label group by a.group for a in items track by a.id"></select>
+    </div>
+  </div>
+</div>

benchmarks/orderby-bp/app.js

@@ -0,0 +1,48 @@
+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();
+    }
+  });
+});

benchmarks/orderby-bp/bp.conf.js

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

benchmarks/orderby-bp/main.html

@@ -0,0 +1,82 @@
+<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>

benchmarks/parsed-expressions-bp/app.js

@@ -0,0 +1,87 @@
+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();
+      }
+    }
+  });
+});

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

@@ -0,0 +1,11 @@
+module.exports = function(config) {
+  config.set({
+    scripts: [    {
+      id: 'angular',
+      src: '/build/angular.js'
+    },
+    {
+      src: 'app.js',
+    }]
+  });
+};

benchmarks/parsed-expressions-bp/main.html

@@ -0,0 +1,226 @@
+<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>

bower.json

@@ -1,12 +1,8 @@
 {
   "name": "AngularJS",
   "devDependencies": {
-    "jquery": "1.10.2",
-    "lunr.js": "0.4.3",
-    "open-sans-fontface": "1.0.4",
-    "google-code-prettify": "1.0.1",
-    "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",
-    "bootstrap": "3.1.1"
+    "jquery": "2.1.1",
+    "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
   }
 }

changelog.js

@@ -3,6 +3,8 @@
 // TODO(vojta): pre-commit hook for validating messages
 // TODO(vojta): report errors, currently Q silence everything which really sucks
 
+'use strict';
+
 var child = require('child_process');
 var fs = require('fs');
 var util = require('util');
@@ -110,7 +112,7 @@ var printSection = function(stream, title, section, printCommitLinks) {
         }
         stream.write(')\n');
       } else {
-        stream.write(util.format('%s %s', prefix, commit.subject));
+        stream.write(util.format('%s %s\n', prefix, commit.subject));
       }
     });
   });
@@ -164,7 +166,7 @@ var writeChangelog = function(stream, commits, version) {
         hash: commit.hash,
         closes: []
       });
-    };
+    }
   });
 
   stream.write(util.format(HEADER_TPL, version, version, currentDate()));
@@ -172,7 +174,7 @@ var writeChangelog = function(stream, commits, version) {
   printSection(stream, 'Features', sections.feat);
   printSection(stream, 'Performance Improvements', sections.perf);
   printSection(stream, 'Breaking Changes', sections.breaks, false);
-}
+};
 
 
 var getPreviousTag = function() {
@@ -186,6 +188,7 @@ 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) {
@@ -199,6 +202,7 @@ 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) {

changelog.spec.js

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

compare-master-to-stable.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 var util = require('util');
 var cp = require('child_process');
 
@@ -101,10 +103,10 @@ then(function (tags) {
     sort(semver.rcompare);
 }).
 then(function (tags) {
-  var major = tags[0].split('.')[0] + '.x';
+  var major = tags[0].split('.')[0];
   return tags.
     filter(function (ver) {
-      return semver.satisfies(ver, major);
+      return semver(ver).major == major;
     });
 }).
 then(function (tags) {
@@ -143,10 +145,10 @@ then(allInSeries(function (branch) {
         line = line.split(' ');
         var sha = line.shift();
         var msg = line.join(' ');
-        return sha + (msg.toLowerCase().indexOf('fix') === -1 ? '   ' : ' * ') + msg;
+        return sha + ((/fix\([^\)]+\):/i.test(msg))  ? ' * ' : '   ') + msg;
       });
       branch.log = log.map(function (line) {
-        return line.substr(41)
+        return line.substr(41);
       });
       return branch;
     });

css/angular.css

@@ -2,10 +2,18 @@
 
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
 .ng-cloak, .x-ng-cloak,
-.ng-hide {
+.ng-hide:not(.ng-hide-animate) {
   display: none !important;
 }
 
 ng\:form {
   display: block;
 }
+
+.ng-animate-shim {
+  visibility:hidden;
+}
+
+.ng-anchor {
+  position:absolute;
+}

docs/app/assets/css/docs.css

@@ -128,6 +128,10 @@ 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;
@@ -211,6 +215,10 @@ code.highlighted {
   color:maroon;
 }
 
+ul + p {
+  margin-top: 10px;
+}
+
 .docs-version-jump {
   min-width:100%;
   max-width:100%;
@@ -253,6 +261,9 @@ code.highlighted {
   z-index: 99;
   cursor: pointer;
   font-size: 16px;
+  -moz-appearance: none;
+  text-indent: 0.01px;
+  text-overflow: '';
 }
 
 .picker:after {
@@ -309,10 +320,10 @@ iframe.example {
 }
 
 .search-results-group.col-group-api { width:30%; }
-.search-results-group.col-group-guide { width:30%; }
-.search-results-group.col-group-tutorial { width:25%; }
+.search-results-group.col-group-guide,
+.search-results-group.col-group-tutorial { width:20%; }
 .search-results-group.col-group-misc,
-.search-results-group.col-group-error { float:right; clear:both; width:15% }
+.search-results-group.col-group-error { width:15%; float: right; }
 
 
 .search-results-group.col-group-api .search-result {
@@ -384,7 +395,6 @@ iframe.example {
   position:fixed;
   top:120px;
   bottom:0;
-  padding-bottom:120px;
   overflow:auto;
 }
 
@@ -405,6 +415,7 @@ iframe.example {
 
 .main-body-grid .side-navigation {
   position:relative;
+  padding-bottom:120px;
 }
 
 .main-body-grid .side-navigation.ng-hide {
@@ -535,10 +546,10 @@ h4 {
   margin-left:10px;
 }
 
-.btn:hover {
-  color:black!important;
+.btn:hover, .btn:focus {
+  color: black!important;
   border: 1px solid #ddd!important;
-  background:white!important;
+  background: white!important;
 }
 
 .view-source, .improve-docs {
@@ -572,6 +583,21 @@ ul.events > li {
   margin-bottom:40px;
 }
 
+.definition-table td {
+  padding: 8px;
+  border: 1px solid #eee;
+  vertical-align: top;
+}
+
+@media only screen and (min-width: 769px) and (max-width: 991px) {
+  .main-body-grid {
+    margin-top: 160px;
+  }
+  .main-body-grid > .grid-left {
+    top: 160px;
+  }
+}
+
 @media only screen and (max-width : 768px) {
   .picker, .picker select {
     width:auto;
@@ -611,6 +637,7 @@ ul.events > li {
   }
   .main-body-grid .side-navigation {
     display:block!important;
+    padding-bottom:50px;
   }
   .main-body-grid .side-navigation.ng-hide {
     display:none!important;
@@ -619,12 +646,14 @@ ul.events > li {
     display:inline-block;
     padding:3px 0;
   }
-  .nav-index-group .nav-index-listing:not(.nav-index-section) + .nav-index-listing:not(.nav-index-section):after {
-      padding-right:5px;
-      content:",  ";
+  .nav-index-group .nav-index-listing:not(.nav-index-section):after {
+    padding-right:5px;
+    margin-left:-3px;
+    content:",  ";
   }
-  .nav-index-group .nav-index-listing:last-child {
+  .nav-index-group .nav-index-listing:last-child:after {
     content:"";
+    display:inline-block;
   }
   .nav-index-group .nav-index-section {
     display:block;
@@ -634,14 +663,14 @@ ul.events > li {
   }
   .toc-close {
     position: absolute;
-    bottom: -50px;
+    bottom: 5px;
     left: 50%;
     margin-left: -50%;
     text-align: center;
     padding: 5px;
     background: #eee;
     border-radius: 5px;
-    width: 90%;
+    width: 100%;
     border:1px solid #ddd;
     box-shadow:0 0 10px #bbb;
   }
@@ -672,3 +701,7 @@ ul.events > li {
     padding-bottom:0px;
   }
 }
+
+iframe[name="example-anchoringExample"] {
+  height:400px;
+}

docs/app/assets/css/prettify-theme.css

@@ -6,6 +6,10 @@
   line-height: 1.5;
 }
 
+.lang-text * {
+  color: #333333!important;
+}
+
 .pln {
   color: #333333;
 }

docs/app/assets/css/prettify.css

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

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

@@ -1,284 +0,0 @@
-'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, '&').
-    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.on('$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);

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

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

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

@@ -0,0 +1,44 @@
+"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 });
+};

docs/app/e2e/.jshintrc

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

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

@@ -0,0 +1,51 @@
+'use strict';
+
+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');
+      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');
+      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');
+
+      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
+      ngBindLink.click();
+
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('ngClick');
+    });
+
+
+    it('should show the functioning input directive example', function () {
+      browser.get('build/docs/index.html#!/api/ng/directive/input');
+
+      // Ensure that the page is loaded before trying to switch frames.
+      browser.waitForAngular();
+
+      browser.switchTo().frame('example-input-directive');
+
+      var nameInput = element(by.model('user.name'));
+      nameInput.sendKeys('!!!');
+
+      var code = element.all(by.css('tt')).first();
+      expect(code.getText()).toContain('guest!!!');
+    });
+
+    it("should trim indentation from code blocks", function() {
+      browser.get('build/docs/index.html#!/api/ng/type/$rootScope.Scope');
+
+      var codeBlocks = element.all(by.css('pre > code.lang-js'));
+      codeBlocks.each(function(codeBlock) {
+        var firstSpan = codeBlock.all(by.css('span')).first();
+        expect(firstSpan.getText()).not.toMatch(/^\W+$/);
+      });
+    });
+  });
+});

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

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

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

@@ -0,0 +1,22 @@
+'use strict';
+
+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');
+    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');
+    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');
+    expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
+  });
+
+});

docs/app/e2e/app.scenario.js

@@ -1,12 +1,35 @@
 '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();
     //   browser.waitForAngular();
 
-    //   var search = element(by.input('q'));
+    //   var search = element(by.model('q'));
     //   search.clear();
     //   search.sendKeys('ngBind');
 
@@ -16,7 +39,7 @@ describe('docs.angularjs.org', function () {
 
 
     it('should change the page content when clicking a link to a service', function () {
-      browser.get('');
+      browser.get('build/docs/index.html');
 
       var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
       ngBindLink.click();
@@ -26,46 +49,38 @@ describe('docs.angularjs.org', function () {
     });
 
 
-    it('should show the functioning input directive example', function () {
-      browser.get('index-debug.html#!/api/ng/directive/input');
-
-      //Wait for animation
-      browser.sleep(500);
-
-      browser.switchTo().frame('example-input-directive');
-
-      var nameInput = element(by.input('user.name'));
-      nameInput.sendKeys('!!!');
-
-      var code = element(by.css('tt'));
-      expect(code.getText()).toContain('guest!!!');
-    });
-
 
     it('should be resilient to trailing slashes', function() {
-      browser.get('index-debug.html#!/api/ng/function/angular.noop/');
+      browser.get('build/docs/index.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('index-debug.html#!/api/ng/function/angular.noop/index');
+      browser.get('build/docs/index.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('index-debug.html#!/api/ng/function/angular.noop/index/');
+      browser.get('build/docs/index.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('index-debug.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
+      browser.get('build/docs/index.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
       expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
     });
+
+    it("should display an error if the page does not exist", function() {
+      browser.get('build/docs/index.html#!/api/does/not/exist');
+      expect(element(by.css('h1')).getText()).toBe('Oops!');
+    });
+
   });
-});
+
+});

docs/app/src/app.js

@@ -6,6 +6,7 @@ angular.module('docsApp', [
   'DocsController',
   'versionsData',
   'pagesData',
+  'navData',
   'directives',
   'errors',
   'examples',
@@ -13,11 +14,9 @@ angular.module('docsApp', [
   'tutorials',
   'versions',
   'bootstrap',
-  'bootstrapPrettify',
   'ui.bootstrap.dropdown'
 ])
 
-
-.config(function($locationProvider) {
+.config(['$locationProvider', function($locationProvider) {
   $locationProvider.html5Mode(true).hashPrefix('!');
-});
+}]);

docs/app/src/directives.js

@@ -28,5 +28,10 @@ angular.module('directives', [])
       element.html(window.prettyPrintOne(html, lang, linenums));
     }
   };
-});
+})
 
+.directive('scrollYOffsetElement', ['$anchorScroll', function($anchorScroll) {
+  return function(scope, element) {
+    $anchorScroll.yOffset = element;
+  };
+}]);

docs/app/src/docs.js

@@ -6,87 +6,34 @@ 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.path,
+      active: navItem.href && this.currentPage && this.currentPage.path,
+      current: this.currentPage && this.currentPage.path === navItem.href,
       'nav-index-section': navItem.type === 'section'
     };
   };
 
-  $scope.afterPartialLoaded = function() {
+
+
+  $scope.$on('$includeContentLoaded', 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) {
 
-    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);
-    }
+    path = path.replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
 
     currentPage = $scope.currentPage = NG_PAGES[path];
 
     if ( currentPage ) {
-      $scope.currentArea = currentPage && NG_NAVIGATION[currentPage.area];
+      $scope.partialPath = 'partials/' + path + '.html';
+      $scope.currentArea = NG_NAVIGATION[currentPage.area];
       var pathParts = currentPage.path.split('/');
       var breadcrumb = $scope.breadcrumb = [];
       var breadcrumbPath = '';
@@ -98,6 +45,7 @@ angular.module('DocsController', [])
     } else {
       $scope.currentArea = NG_NAVIGATION['api'];
       $scope.breadcrumb = [];
+      $scope.partialPath = 'Error404.html';
     }
   });
 
@@ -107,24 +55,12 @@ 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;
-      });
-    }
-  });
 }]);

docs/app/src/errors.js

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

docs/app/src/examples.js

@@ -1,8 +1,16 @@
 angular.module('examples', [])
 
 .factory('formPostData', ['$document', function($document) {
-  return function(url, fields) {
-    var form = angular.element('<form style="display: none;" method="post" action="' + url + '" target="_blank"></form>');
+  return function(url, newWindow, fields) {
+    /**
+     * If the form posts to target="_blank", pop-up blockers can cause it not to work.
+     * If a user choses to bypass pop-up blocker one time and click the link, they will arrive at
+     * a new default plnkr, not a plnkr with the desired template.  Given this undesired behavior,
+     * some may still want to open the plnk in a new window by opting-in via ctrl+click.  The
+     * newWindow param allows for this possibility.
+     */
+    var target = newWindow ? '_blank' : '_self';
+    var form = angular.element('<form style="display: none;" method="post" action="' + url + '" target="' + target + '"></form>');
     angular.forEach(fields, function(value, name) {
       var input = angular.element('<input type="hidden" name="' +  name + '">');
       input.attr('value', value);
@@ -16,9 +24,10 @@ angular.module('examples', [])
 
 
 .factory('openPlunkr', ['formPostData', '$http', '$q', function(formPostData, $http, $q) {
-  return function(exampleFolder) {
+  return function(exampleFolder, clickEvent) {
 
     var exampleName = 'AngularJS Example';
+    var newWindow = clickEvent.ctrlKey || clickEvent.metaKey;
 
     // Load the manifest for the example
     $http.get(exampleFolder + '/manifest.json')
@@ -66,7 +75,7 @@ angular.module('examples', [])
         postData.private = true;
         postData.description = exampleName;
 
-        formPostData('http://plnkr.co/edit/?p=preview', postData);
+        formPostData('http://plnkr.co/edit/?p=preview', newWindow, postData);
       });
   };
-}]);
+}]);

docs/app/src/navigationService.js

@@ -1,24 +0,0 @@
-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;
-
-    }
-  };
-});

docs/app/src/search.js

@@ -8,107 +8,172 @@ angular.module('search', [])
   }
 
   $scope.search = function(q) {
-    var MIN_SEARCH_LENGTH = 3;
+    var MIN_SEARCH_LENGTH = 2;
     if(q.length >= MIN_SEARCH_LENGTH) {
-      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;
+      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;
+      });
     }
     else {
       clearResults();
     }
     if(!$scope.$$phase) $scope.$apply();
   };
+
   $scope.submit = function() {
     var result;
-    for(var i in $scope.results) {
-      result = $scope.results[i][0];
-      if(result) {
-        break;
+    if ($scope.results.api) {
+      result = $scope.results.api[0];
+    } else {
+      for(var i in $scope.results) {
+        result = $scope.results[i][0];
+        if(result) {
+          break;
+        }
       }
     }
     if(result) {
-      $location.path(result.url);
+      $location.path(result.path);
       $scope.hideResults();
     }
   };
+
   $scope.hideResults = function() {
     clearResults();
     $scope.q = '';
   };
 }])
 
-.controller('Error404SearchCtrl', ['$scope', '$location', 'docsSearch', function($scope, $location, docsSearch) {
-  $scope.results = docsSearch($location.path().split(/[\/\.:]/).pop());
+
+.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;
+    });
+  });
 }])
 
-.factory('lunrSearch', function() {
-  return function(properties) {
-    if (window.RUNNING_IN_NG_TEST_RUNNER) return null;
 
-    var engine = lunr(properties);
-    return {
-      store : function(values) {
-        engine.add(values);
-      },
-      search : function(q) {
-        return engine.search(q);
-      }
-    };
-  };
-})
+.provider('docsSearch', function() {
 
-.factory('docsSearch', ['$rootScope','lunrSearch', 'NG_PAGES',
-    function($rootScope, lunrSearch, NG_PAGES) {
-  if (window.RUNNING_IN_NG_TEST_RUNNER) {
-    return null;
-  }
+  // 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) {
 
-  var index = lunrSearch(function() {
-    this.ref('id');
-    this.field('title', {boost: 50});
-    this.field('keywords', { boost : 20 });
-  });
+    console.log('Using Local Search Index');
 
-  angular.forEach(NG_PAGES, function(page, key) {
-    if(page.searchTerms) {
-      index.store({
-        id : key,
-        title : page.searchTerms.titleWords,
-        keywords : page.searchTerms.keywords
+    // 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;
       });
     };
-  });
+  }
+  localSearchFactory.$inject = ['$http', '$timeout', 'NG_PAGES'];
 
-  return function(q) {
-    var results = {
-      api : [],
-      tutorial : [],
-      guide : [],
-      error : [],
-      misc : []
+  // 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;
+        }
+      });
     };
-    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;
+    // 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
   };
-}])
+})
 
 .directive('focused', function($timeout) {
   return function(scope, element, attrs) {

docs/app/src/tutorials.js

@@ -1,6 +1,6 @@
 angular.module('tutorials', [])
 
-.directive('docTutorialNav', function(templateMerge) {
+.directive('docTutorialNav', function() {
   var pages = [
     '',
     'step_00', 'step_01', 'step_02', 'step_03', 'step_04',
@@ -8,23 +8,22 @@ angular.module('tutorials', [])
     'step_10', 'step_11', 'step_12', 'the_end'
   ];
   return {
-    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
-          };
+    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;
 
       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));
     }
   };
 })
@@ -36,7 +35,7 @@ angular.module('tutorials', [])
       'step': '@docTutorialReset'
     },
     template:
-      '<p><a href="" ng-click="show=!show;$event.stopPropagation()">Workspace Reset Instructions  ➤</a></p>\n' +
+      '<p><button class="btn" ng-click="show=!show">Workspace Reset Instructions  ➤</button></p>\n' +
       '<div class="alert alert-info" ng-show="show">\n' +
       '  <p>Reset the workspace to step {{step}}.</p>' +
       '  <p><pre>git checkout -f step-{{step}}</pre></p>\n' +
@@ -44,7 +43,7 @@ angular.module('tutorials', [])
           '<a href="http://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
       '</div>\n' +
       '<p>The most important changes are listed below. You can see the full diff on ' +
-        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}">GitHub</a>\n' +
+        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}" title="See diff on Github">GitHub</a>\n' +
       '</p>'
   };
-});
+});

docs/app/src/versions.js

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

docs/app/test/docsSpec.js

@@ -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.afterPartialLoaded();
+      $scope.$broadcast('$includeContentLoaded');
       expect($window._gaq.pop()).toEqual(['_trackPageview', 'a/b/c']);
     }));
 
@@ -27,8 +27,8 @@ 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.afterPartialLoaded();
+      $scope.$broadcast('$includeContentLoaded');
       expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']);
     }));
   });
-});
+});

docs/bower.json

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

docs/config/index.js

@@ -1,43 +1,173 @@
-var _ = require('lodash');
+"use strict";
+
 var path = require('canonical-path');
 var packagePath = __dirname;
 
-var basePackage = require('dgeni-packages/ngdoc');
-var examplesPackage = require('dgeni-packages/examples');
+var Package = require('dgeni').Package;
 
-module.exports = function(config) {
+// 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.
+module.exports = new Package('angularjs', [
+  require('dgeni-packages/ngdoc'),
+  require('dgeni-packages/nunjucks'),
+  require('dgeni-packages/examples'),
+  require('dgeni-packages/git')
+])
 
-  config = basePackage(config);
-  config = examplesPackage(config);
-  
-  config.append('processing.processors', [
-    require('./processors/git-data'),
-    require('./processors/error-docs'),
-    require('./processors/keywords'),
-    require('./processors/versions-data'),
-    require('./processors/pages-data'),
-    require('./processors/protractor-generate'),
-    require('./processors/index-page'),
-    require('./processors/debug-dump')
-  ]);
 
-  config.append('processing.tagDefinitions', [
-    require('./tag-defs/tutorial-step')
-  ]);
+.factory(require('./services/errorNamespaceMap'))
+.factory(require('./services/getMinerrInfo'))
+.factory(require('./services/getVersion'))
 
-  config.append('processing.defaultTagTransforms', [
-    require('dgeni-packages/jsdoc/tag-defs/transforms/trim-whitespace')
-  ]);
+.factory(require('./services/deployments/debug'))
+.factory(require('./services/deployments/default'))
+.factory(require('./services/deployments/jquery'))
+.factory(require('./services/deployments/production'))
 
-  config.append('processing.inlineTagDefinitions', [
-    require('./inline-tag-defs/type')
-  ]);
+.factory(require('./inline-tag-defs/type'))
 
-  config.set('processing.search.ignoreWordsFile', path.resolve(packagePath, 'ignore.words'));
+.processor(require('./processors/error-docs'))
+.processor(require('./processors/index-page'))
+.processor(require('./processors/keywords'))
+.processor(require('./processors/pages-data'))
+.processor(require('./processors/versions-data'))
 
-  config.prepend('rendering.templateFolders', [
-    path.resolve(packagePath, 'templates')
-  ]);
 
-  return config;
-};
+.config(function(dgeni, log, readFilesProcessor, writeFilesProcessor) {
+
+  dgeni.stopOnValidationError = true;
+  dgeni.stopOnProcessingError = true;
+
+  log.level = 'info';
+
+  readFilesProcessor.basePath = path.resolve(__dirname,'../..');
+  readFilesProcessor.sourceFiles = [
+    { include: 'src/**/*.js', basePath: 'src' },
+    { include: 'docs/content/**/*.ngdoc', basePath: 'docs/content' }
+  ];
+
+  writeFilesProcessor.outputFolder = 'build/docs';
+
+})
+
+
+.config(function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/tutorial-step'));
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/sortOrder'));
+})
+
+
+.config(function(inlineTagProcessor, typeInlineTagDef) {
+  inlineTagProcessor.inlineTagDefinitions.push(typeInlineTagDef);
+})
+
+
+.config(function(templateFinder, renderDocsProcessor, gitData) {
+  templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates'));
+  renderDocsProcessor.extraData.git = gitData;
+})
+
+
+.config(function(computePathsProcessor, computeIdsProcessor) {
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['error'],
+    pathTemplate: 'error/${namespace}/${name}',
+    outputPathTemplate: 'partials/error/${namespace}/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['errorNamespace'],
+    pathTemplate: 'error/${name}',
+    outputPathTemplate: 'partials/error/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['overview', 'tutorial'],
+    getPath: function(doc) {
+      var docPath = path.dirname(doc.fileInfo.relativePath);
+      if ( doc.fileInfo.baseName !== 'index' ) {
+        docPath = path.join(docPath, doc.fileInfo.baseName);
+      }
+      return docPath;
+    },
+    outputPathTemplate: 'partials/${path}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['e2e-test'],
+    getPath: function() {},
+    outputPathTemplate: 'ptore2e/${example.id}/${deployment.name}_test.js'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['indexPage'],
+    pathTemplate: '.',
+    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'],
+    getId: function(doc) { return doc.fileInfo.baseName; },
+    getAliases: function(doc) { return [doc.id]; }
+  });
+
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['error'],
+    getId: function(doc) { return 'error:' + doc.namespace + ':' + doc.name; },
+    getAliases: function(doc) { return [doc.name, doc.namespace + ':' + doc.name, doc.id]; }
+  },
+  {
+    docTypes: ['errorNamespace'],
+    getId: function(doc) { return 'error:' + doc.name; },
+    getAliases: function(doc) { return [doc.id]; }
+  }
+  );
+})
+
+.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,
+  generateProtractorTestsProcessor,
+  generateExamplesProcessor,
+  debugDeployment, defaultDeployment,
+  jqueryDeployment, productionDeployment) {
+
+  generateIndexPagesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
+
+  generateProtractorTestsProcessor.deployments = [
+    defaultDeployment,
+    jqueryDeployment
+  ];
+
+  generateProtractorTestsProcessor.basePath = 'build/docs/';
+
+  generateExamplesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
+});

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

@@ -1,12 +1,17 @@
-var typeClassFilter = require('dgeni-packages/ngdoc/rendering/filters/type-class');
+"use strict";
+
 var encoder = new require('node-html-encoder').Encoder();
 
-module.exports = {
-  name: 'type',
-  description: 'Replace with markup that displays a nice type',
-  handlerFactory: function() {
-    return function(doc, tagName, tagDescription) {
-      return '<a href="" class="' + typeClassFilter.process(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
-    };
-  }
-};
+/**
+ * @dgService typeInlineTagDef
+ * @description
+ * Replace with markup that displays a nice type
+ */
+module.exports = function typeInlineTagDef(getTypeClass) {
+  return {
+    name: 'type',
+    handler: function(doc, tagName, tagDescription) {
+      return '<a href="" class="' + getTypeClass(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
+    }
+  };
+};

docs/config/processors/debug-dump.js

@@ -1,33 +0,0 @@
-var fs = require('q-io/fs');
-var log = require('winston');
-var util = require("util");
-
-module.exports = {
-  name: 'debug-dump',
-  runBefore: ['write-files'],
-  description: 'This processor dumps docs that match a filter to a file',
-  process: function(docs, config) {
-
-    var filter, outputPath, depth;
-
-    filter = config.get('processing.debug-dump.filter');
-    outputPath = config.get('processing.debug-dump.outputPath');
-    depth = config.get('processing.debug-dump.depth', 2);
-
-
-    if ( filter && outputPath ) {
-      log.info('Dumping docs:', filter, outputPath);
-      var filteredDocs = filter(docs);
-      var dumpedDocs = util.inspect(filteredDocs, depth);
-      return writeFile(outputPath, dumpedDocs).then(function() {
-        return docs;
-      });
-    }
-  }
-};
-
-function writeFile(file, content) {
-  return fs.makeTree(fs.directory(file)).then(function() {
-    return fs.write(file, content, 'wb');
-  });
-}

docs/config/processors/error-docs.js

@@ -1,59 +1,52 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'error-docs',
-  description: 'Compute the various fields for docs in the Error area',
-  runAfter: ['tags-extracted', 'compute-path'],
-  runBefore: ['extra-docs-added'],
-  exports: {
-    errorNamespaces: ['factory', function() { return {}; }],
-    minerrInfo: ['factory', function(config) {
-      var minerrInfoPath = config.get('processing.errors.minerrInfoPath');
-      if ( !minerrInfoPath ) {
-        throw new Error('Error in configuration: Please provide a path to the minerr info file (errors.json) ' +
-          'in the `config.processing.errors.minerrInfoPath` property');
-      }
-      return require(minerrInfoPath);
-    }]
-  },
-  process: function(docs, partialNames, errorNamespaces, minerrInfo) {
+/**
+ * @dgProcessor errorDocsProcessor
+ * @description
+ * Process "error" docType docs and generate errorNamespace docs
+ */
+module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
+  return {
+    $runAfter: ['tags-extracted'],
+    $runBefore: ['extra-docs-added'],
+    $process: function(docs) {
 
-    // Create error namespace docs and attach error docs to each
-    _.forEach(docs, function(doc) {
-      if ( doc.docType === 'error' ) {
+      // Create error namespace docs and attach error docs to each
+      docs.forEach(function(doc) {
+        var parts, namespaceDoc;
 
-        // Parse out the error info from the id
-        parts = doc.name.split(':');
-        doc.namespace = parts[0];
-        doc.name = parts[1];
+        if ( doc.docType === 'error' ) {
 
+          // Parse out the error info from the id
+          parts = doc.name.split(':');
+          doc.namespace = parts[0];
+          doc.name = parts[1];
 
-        var namespaceDoc = errorNamespaces[doc.namespace];
-        if ( !namespaceDoc ) {
-          // First time we came across this namespace, so create a new one
-          namespaceDoc = errorNamespaces[doc.namespace] = {
-            area: doc.area,
-            name: doc.namespace,
-            errors: [],
-            path: path.dirname(doc.path),
-            outputPath: path.dirname(doc.outputPath) + '.html',
-            docType: 'errorNamespace'
-          };
+          // Get or create the relevant errorNamespace doc
+          namespaceDoc = errorNamespaceMap.get(doc.namespace);
+          if ( !namespaceDoc ) {
+            namespaceDoc = {
+              area: 'error',
+              name: doc.namespace,
+              errors: [],
+              docType: 'errorNamespace'
+            };
+            errorNamespaceMap.set(doc.namespace, namespaceDoc);
+          }
+
+          // Link this error doc to its namespace doc
+          namespaceDoc.errors.push(doc);
+          doc.namespaceDoc = namespaceDoc;
+          doc.formattedErrorMessage = getMinerrInfo().errors[doc.namespace][doc.name];
         }
+      });
 
-        // Add this error to the namespace
-        namespaceDoc.errors.push(doc);
-        doc.namespace = namespaceDoc;
-
-        doc.formattedErrorMessage = minerrInfo.errors[doc.namespace.name][doc.name];
-
-      }
-
-    });
-
-
-    return docs.concat(_.values(errorNamespaces));
-  }
+      errorNamespaceMap.forEach(function(errorNamespace) {
+        docs.push(errorNamespace);
+      });
+    }
+  };
 };

docs/config/processors/git-data.js

@@ -1,20 +0,0 @@
-var gruntUtils = require('../../../lib/grunt/utils');
-var versionInfo = require('../../../lib/versions/version-info');
-
-module.exports = {
-  name: 'git-data',
-  runBefore: ['reading-files'],
-  description: 'This processor adds information from the local git repository to the extraData injectable',
-  exports: {
-    gitData: ['factory', function() {
-      return {
-        version: versionInfo.currentVersion,
-        versions: versionInfo.previousVersions,
-        info: versionInfo.gitRepoInfo
-      };
-    }]
-  },
-  process: function(extraData, gitData) {
-    extraData.git = gitData;
-  }
-};

docs/config/processors/index-page.js

@@ -1,40 +1,43 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'index-page',
-  runAfter: ['adding-extra-docs'],
-  runBefore: ['extra-docs-added'],
-  description: 'This processor creates docs that will be rendered as the index page for the app',
-  process: function(docs, config) {
+/**
+ * @dgProcessor generateIndexPagesProcessor
+ * @description
+ * This processor creates docs that will be rendered as the index page for the app
+ */
+module.exports = function generateIndexPagesProcessor() {
+  return {
+    deployments: [],
+    $validate: {
+      deployments: { presence: true }
+    },
+    $runAfter: ['adding-extra-docs'],
+    $runBefore: ['extra-docs-added'],
+    $process: function(docs) {
 
-    var deployment = config.deployment;
-    if ( !deployment || !deployment.environments ) {
-      throw new Error('No deployment environments found in the config.');
+      // Collect up all the areas in the docs
+      var areas = {};
+      docs.forEach(function(doc) {
+        if ( doc.area ) {
+          areas[doc.area] = doc.area;
+        }
+      });
+      areas = _.keys(areas);
+
+      this.deployments.forEach(function(deployment) {
+
+        var indexDoc = _.defaults({
+          docType: 'indexPage',
+          areas: areas
+        }, deployment);
+
+        indexDoc.id = 'index' + (deployment.name === 'default' ? '' : '-' + deployment.name);
+
+        docs.push(indexDoc);
+      });
     }
-
-    // Collect up all the areas in the docs
-    var areas = {};
-    _.forEach(docs, function(doc) {
-      if ( doc.area ) {
-        areas[doc.area] = doc.area;
-      }
-    });
-    areas = _.keys(areas);
-
-    _.forEach(deployment.environments, function(environment) {
-
-      var indexDoc = _.defaults({
-        docType: 'indexPage',
-        areas: areas
-      }, environment);
-
-      indexDoc.id = 'index' + (environment.name === 'default' ? '' : '-' + environment.name);
-      // Use .. to put it at the root of the build
-      indexDoc.outputPath = indexDoc.id + '.html';
-
-      docs.push(indexDoc);
-    });
-  }
-};
+  };
+};