.eslintrc-base.json

@@ -104,6 +104,7 @@
     "no-spaced-func": "error",
     "no-trailing-spaces": "error",
     "no-unneeded-ternary": "error",
+    "quotes": ["error", "single"],
     "semi-spacing": "error",
     "semi": "error",
     "space-before-blocks": ["error", "always"],

.eslintrc-todo.json

@@ -20,7 +20,6 @@
     "key-spacing": ["error", { "beforeColon": false, "afterColon": true, "mode": "minimum" }],
     "object-curly-spacing": ["error", "never"],
     "object-property-newline": ["error", { "allowMultiplePropertiesPerLine": true }],
-    "operator-linebreak": ["error", "after", { "overrides": { "?": "before", ":": "before" }}],
-    "quotes": ["error", "single"]
+    "operator-linebreak": ["error", "after", { "overrides": { "?": "before", ":": "before" }}]
   }
 }

CHANGELOG.md

@@ -86,7 +86,7 @@ to make the fixes available to people that still need IE8 support._
   - secure `link[href]` as a `RESOURCE_URL`s in `$sce`
   ([f35f334b](https://github.com/angular/angular.js/commit/f35f334bd3197585bdf034f4b6d9ffa3122dac62),
    [#14687](https://github.com/angular/angular.js/issues/14687))
-  - properly sanitize `xlink:href` attribute interoplation
+  - properly sanitize `xlink:href` attribute interpolation
   ([f2fa1ed8](https://github.com/angular/angular.js/commit/f2fa1ed83d18d4e79a36f8c0db1c2524d762e513),
    [2687c261](https://github.com/angular/angular.js/commit/2687c26140585d9e3716f9f559390f5d8d598fdf))
 - **ngSanitize:** blacklist the attribute `usemap` as it can be used as a security exploit
@@ -137,6 +137,9 @@ content, which is a security risk.
   - cope with `$onChanges` hooks throwing
   ([3749c858](https://github.com/angular/angular.js/commit/3749c85829406ca57cc5729e80696c7f34134068),
    [#14444](https://github.com/angular/angular.js/issues/14444), [#14463](https://github.com/angular/angular.js/issues/14463))
+- **$location:** initialize `$$absUrl` to empty string
+  ([294d6793f](https://github.com/angular/angular.js/commit/294d6793fd0e0781a257e35a165e0c6fde082fe7),
+   [#11091](https://github.com/angular/angular.js/issues/11091), [#13565](https://github.com/angular/angular.js/issues/13565), [#14488](https://github.com/angular/angular.js/issues/14488))
 - **$parse:** allow arguments to contain filter chains
   ([cc6dcb4b](https://github.com/angular/angular.js/commit/cc6dcb4bc28aadff4f62d76d6451b0f80b928e69),
    [#4175](https://github.com/angular/angular.js/issues/4175), [#4168](https://github.com/angular/angular.js/issues/4168), [#14720](https://github.com/angular/angular.js/issues/14720))
@@ -506,7 +509,7 @@ for more info.
   - prevent assignment on constructor properties
   ([f47e2180](https://github.com/angular/angular.js/commit/f47e218006029f39b4785d820b430de3a0eebcb0),
    [#13417](https://github.com/angular/angular.js/issues/13417))
-  - preserve expensive checks when runnning `$eval` inside an expression
+  - preserve expensive checks when running `$eval` inside an expression
   ([96d62cc0](https://github.com/angular/angular.js/commit/96d62cc0fc77248d7e3ec4aa458bac0d3e072629))
   - copy `inputs` for expressions with expensive checks
   ([0b7fff30](https://github.com/angular/angular.js/commit/0b7fff303f46202bbae1ff3ca9d0e5fa76e0fc9a))
@@ -628,7 +631,7 @@ changes section for more information
   - handle boolean attributes in `@` bindings
   ([db5e0ffe](https://github.com/angular/angular.js/commit/db5e0ffe124ac588f01ef0fe79efebfa72f5eec7),
    [#13767](https://github.com/angular/angular.js/issues/13767), [#13769](https://github.com/angular/angular.js/issues/13769))
-- **$parse:** Preserve expensive checks when runnning $eval inside an expression
+- **$parse:** Preserve expensive checks when running $eval inside an expression
   ([acfda102](https://github.com/angular/angular.js/commit/acfda1022d23ecaea34bbc8931588a0715b3ab03))
 - **dateFilter:** follow the CLDR on pattern escape sequences
   ([1ab4e444](https://github.com/angular/angular.js/commit/1ab4e44443716c33cd857dcb1098d20580dbb0cc),
@@ -1008,26 +1011,20 @@ report any regressions or other issues you find as soon as possible.
 
 - **$parse:** provide a mechanism to access the locals object, `$locals`
   ([0ea53503](https://github.com/angular/angular.js/commit/0ea535035a3a1a992948490c3533bffb83235052))
-
 - **$resource:** add proper support for cancelling requests, `$cancelRequest()`
   ([98528be3](https://github.com/angular/angular.js/commit/98528be311b48269ba0e15ba4e3e2ad9b89693a9),
    [#9332](https://github.com/angular/angular.js/issues/9332), [#13050](https://github.com/angular/angular.js/issues/13050), [#13058](https://github.com/angular/angular.js/issues/13058), [#13210](https://github.com/angular/angular.js/issues/13210))
-
 - **ngAnimate:** provide ng-[event]-prepare class for structural animations
   ([6e18b50a](https://github.com/angular/angular.js/commit/6e18b50a5b168848cc526081b0a2a16075ee44bd))
-
 - **ngLocale:** add support for standalone months
   ([96c73a06](https://github.com/angular/angular.js/commit/96c73a0672f0e46ae9285c482b057bd03ce135ba),
    [#3744](https://github.com/angular/angular.js/issues/3744), [#10247](https://github.com/angular/angular.js/issues/10247), [#12642](https://github.com/angular/angular.js/issues/12642), [#12844](https://github.com/angular/angular.js/issues/12844))
-
 - **ngMock:** destroy $rootScope after each test
   ([b75c0d8d](https://github.com/angular/angular.js/commit/b75c0d8d0549261ece551210a11d8be48c3ab3cc),
    [#13433](https://github.com/angular/angular.js/issues/13433))
-
 - **ngTransclude:** don't overwrite the contents with an unfilled optional slot
   ([0812af49](https://github.com/angular/angular.js/commit/0812af49bd4f4fad4067603ff64dbe720bd6e3e5),
    [#13426](https://github.com/angular/angular.js/issues/13426))
-
 - **ngView:** reference resolved locals in scope, `resolveAs: '$resolve'`
   ([983b0598](https://github.com/angular/angular.js/commit/983b0598121a8c5a3a51a30120e114d7e3085d4d),
    [#13400](https://github.com/angular/angular.js/issues/13400))
@@ -1044,30 +1041,24 @@ report any regressions or other issues you find as soon as possible.
   - support merging special attribute names in `replace` directives
   ([a5ff651a](https://github.com/angular/angular.js/commit/a5ff651a59933c2c43b81642454ee458f98e1401),
    [#13317](https://github.com/angular/angular.js/issues/13317), [#13318](https://github.com/angular/angular.js/issues/13318))
-
 - **$http:** throw if url passed is not a string
   ([6628b4f1](https://github.com/angular/angular.js/commit/6628b4f1e5835d997290881c6ba394547883a516),
    [#12925](https://github.com/angular/angular.js/issues/12925), [#13444](https://github.com/angular/angular.js/issues/13444))
-
 - **$parse:**
   - prevent assignment on constructor properties
   ([5a674f3b](https://github.com/angular/angular.js/commit/5a674f3bb9d1118d11b333e3b966c01a571c09e6),
    [#13417](https://github.com/angular/angular.js/issues/13417))
   - handle interceptors with `undefined` expressions
   ([4473b81c](https://github.com/angular/angular.js/commit/4473b81cdaf16c5509ac53d80b9bdfb0a7ac5f30))
-
 - **$sanitize:** blacklist SVG `<use>` elements
   ([7a668cdd](https://github.com/angular/angular.js/commit/7a668cdd7d08a7016883eb3c671cbcd586223ae8),
    [#13453](https://github.com/angular/angular.js/issues/13453))
-
 - **formatNumber:** cope with large and small number corner cases
   ([6a0686d4](https://github.com/angular/angular.js/commit/6a0686d434c41445c50b2d9669073802ede77b3b),
    [#13394](https://github.com/angular/angular.js/issues/13394), [#8674](https://github.com/angular/angular.js/issues/8674), [#12709](https://github.com/angular/angular.js/issues/12709), [#8705](https://github.com/angular/angular.js/issues/8705), [#12707](https://github.com/angular/angular.js/issues/12707), [#10246](https://github.com/angular/angular.js/issues/10246), [#10252](https://github.com/angular/angular.js/issues/10252))
-
 - **input:** add missing chars to URL validation regex
   ([e4bb8387](https://github.com/angular/angular.js/commit/e4bb8387952069cca9da06bbc5c87ae576c2bf6f),
    [#13379](https://github.com/angular/angular.js/issues/13379), [#13460](https://github.com/angular/angular.js/issues/13460))
-
 - **ngAnimate:**
   - consider options.delay value for closing timeout
     ([7ffb2d3c](https://github.com/angular/angular.js/commit/7ffb2d3c17643303a51eb4e324c365af70fe3824),
@@ -1081,15 +1072,12 @@ report any regressions or other issues you find as soon as possible.
   - do not alter the provided options data
   ([193153c3](https://github.com/angular/angular.js/commit/193153c3d391338a859cb7788ef32a8af05fb920),
    [#13040](https://github.com/angular/angular.js/issues/13040), [#13175](https://github.com/angular/angular.js/issues/13175))
-
 - **ngMock:** clear out `$providerInjector` after each test
   ([a72c12bd](https://github.com/angular/angular.js/commit/a72c12bd7052da9f60da74625409374342b50b73),
    [#13397](https://github.com/angular/angular.js/issues/13397), [#13416](https://github.com/angular/angular.js/issues/13416))
-
 - **ngOptions:** don't $dirty multiple select after compilation
   ([c7a2028a](https://github.com/angular/angular.js/commit/c7a2028ab38cdfc4d956c50b6f41cbccef302165),
    [#13211](https://github.com/angular/angular.js/issues/13211), [#13326](https://github.com/angular/angular.js/issues/13326))
-
 - **ngTransclude:**
   - don't replace existing content if no transcluded content exists
   ([c3ae6ed7](https://github.com/angular/angular.js/commit/c3ae6ed78e145a9b0c13de7ef95852ba3c467551),

Gruntfile.js

@@ -205,7 +205,7 @@ module.exports = function(grunt) {
         dest: 'build/angular-parse-ext.js',
         src: util.wrap(files['angularModules']['ngParseExt'], 'module')
       },
-      "promises-aplus-adapter": {
+      'promises-aplus-adapter': {
         dest:'tmp/promises-aplus-adapter++.js',
         src:['src/ng/q.js', 'lib/promises-aplus/promises-aplus-test-adapter.js']
       }

README.md

@@ -51,24 +51,57 @@ We've set up a separate document for our [contribution guidelines](https://githu
 
 What to use AngularJS for and when to use it
 ---------
-AngularJS is the next generation framework where each component is designed to work with every other component in an interconnected way like a well-oiled machine. AngularJS is JavaScript MVC made easy and done right. (Well it is not really MVC, read on, to understand what this means.)
+AngularJS is the next generation framework where each component is designed to work with every other
+component in an interconnected way like a well-oiled machine. AngularJS is JavaScript MVC made easy
+and done right. (Well it is not really MVC, read on, to understand what this means.)
 
 #### MVC, no, MV* done the right way!
-MVC, short for Model-View-Controller, is a design pattern, i.e. how the code should be organized and how the different parts of an application separated for proper readability and debugging. Model is the data and the database. View is the user interface and what the user sees. Controller is the main link between Model and View. These are the three pillars of major programming frameworks present on the market today. On the other hand AngularJS works on MV*, short for Model-View-_Whatever_. The _Whatever_ is AngularJS's way of telling that you may create any kind of linking between the Model and the View here.
-
-Unlike other frameworks in any programming language, where MVC, the three separate components, each one has to be written and then connected by the programmer, AngularJS helps the programmer by asking him/her to just create these and everything else will be taken care of by AngularJS.
+MVC, short for Model-View-Controller, is a design pattern, i.e. how the code should be organized and
+how the different parts of an application separated for proper readability and debugging. Model is
+the data and the database. View is the user interface and what the user sees. Controller is the main
+link between Model and View. These are the three pillars of major programming frameworks present on
+the market today. On the other hand AngularJS works on MV*, short for Model-View-_Whatever_. The
+_Whatever_ is AngularJS's way of telling that you may create any kind of linking between the Model
+and the View here.
+
+Unlike other frameworks in any programming language, where MVC, the three separate components, each
+one has to be written and then connected by the programmer, AngularJS helps the programmer by asking
+him/her to just create these and everything else will be taken care of by AngularJS.
 
 #### Interconnection with HTML at the root level
-AngularJS uses HTML to define the user's interface. AngularJS also enables the programmer to write new HTML tags (AngularJS Directives) and increase the readability and understandability of the HTML code. Directives are AngularJS’s way of bringing additional functionality to HTML. Directives achieve this by enabling us to invent our own HTML elements. This also helps in making the code DRY (Don't Repeat Yourself), which means once created, a new directive can be used anywhere within the application.
+AngularJS uses HTML to define the user's interface. AngularJS also enables the programmer to write
+new HTML tags (AngularJS Directives) and increase the readability and understandability of the HTML
+code. Directives are AngularJS’s way of bringing additional functionality to HTML. Directives
+achieve this by enabling us to invent our own HTML elements. This also helps in making the code DRY
+(Don't Repeat Yourself), which means once created, a new directive can be used anywhere within the
+application.
+
+HTML is also used to determine the wiring of the app. Special attributes in the HTML determine where
+to load the app, which components or controllers to use for each element, etc. We specify "what"
+gets loaded, but not "how". This declarative approach greatly simplifies app development in a sort
+of WYSIWYG way. Rather than spending time on how the program flows and orchestrating the various
+moving parts, we simply define what we want and Angular will take care of the dependencies.
 
 #### Data Handling made simple
-Data and Data Models in AngularJS are plain JavaScript objects and one can add and change properties directly on it and loop over objects and arrays at will.
+Data and Data Models in AngularJS are plain JavaScript objects and one can add and change properties
+directly on it and loop over objects and arrays at will.
 
 #### Two-way Data Binding
-One of AngularJS's strongest features. Two-way Data Binding means that if something changes in the Model, the change gets reflected in the View instantaneously, and the same happens the other way around. This is also referred to as Reactive Programming, i.e. suppose `a = b + c` is being programmed and after this, if the value of `b` and/or `c` is changed then the value of `a` will be automatically updated to reflect the change. AngularJS uses its "scopes" as a glue between the Model and View and makes these updates in one available for the other.
+One of AngularJS's strongest features. Two-way Data Binding means that if something changes in the
+Model, the change gets reflected in the View instantaneously, and the same happens the other way
+around. This is also referred to as Reactive Programming, i.e. suppose `a = b + c` is being
+programmed and after this, if the value of `b` and/or `c` is changed then the value of `a` will be
+automatically updated to reflect the change. AngularJS uses its "scopes" as a glue between the Model
+and View and makes these updates in one available for the other.
 
 #### Less Written Code and Easily Maintainable Code
-Everything in AngularJS is created to enable the programmer to end up writing less code that is easily maintainable and readable by any other new person on the team. Believe it or not, one can write a complete working two-way data binded application in less than 10 lines of code. Try and see for yourself!
+Everything in AngularJS is created to enable the programmer to end up writing less code that is
+easily maintainable and readable by any other new person on the team. Believe it or not, one can
+write a complete working two-way data binded application in less than 10 lines of code. Try and see
+for yourself!
 
 #### Testing Ready
-AngularJS has Dependency Injection, i.e. it takes care of providing all the necessary dependencies to its controllers whenever required. This helps in making the AngularJS code ready for unit testing by making use of mock dependencies created and injected. This makes AngularJS more modular and easily testable thus in turn helping a team create more robust applications.
+AngularJS has Dependency Injection, i.e. it takes care of providing all the necessary dependencies
+to its controllers and services whenever required. This helps in making the AngularJS code ready for
+unit testing by making use of mock dependencies created and injected. This makes AngularJS more
+modular and easily testable thus in turn helping a team create more robust applications.

angularFiles.js

@@ -209,7 +209,7 @@ var angularFiles = {
     'build/docs/docs-scenario.js'
   ],
 
-  "karmaModules": [
+  'karmaModules': [
     'build/angular.js',
     '@angularSrcModules',
     'test/modules/no_bootstrap.js',

benchmarks/largetable-bp/app.js

@@ -23,9 +23,9 @@ app.controller('DataController', function DataController($scope, $rootScope) {
   $scope.numberOfBindings = totalRows * totalColumns * 2 + totalRows + 1;
   $scope.numberOfWatches = '?';
 
-  /* @this */
+  /** @this */
   function iGetter() { return this.i; }
-  /* @this */
+  /** @this */
   function jGetter() { return this.j; }
 
   for (var i = 0; i < totalRows; i++) {

benchmarks/ng-options-bp/app.js

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

benchmarks/orderby-bp/app.js

@@ -7,7 +7,7 @@ app.controller('DataController', function DataController($rootScope, $scope) {
   this.rows = [];
   var self = this;
 
-  $scope.benchmarkType = 'basic';
+  $scope.benchmarkType = 'baseline';
 
   $scope.rawProperty = function(key) {
     return function(item) {

benchmarks/orderby-bp/bp.conf.js

@@ -6,8 +6,8 @@ module.exports = function(config) {
   config.set({
     scripts: [
     {
-      "id": "jquery",
-      "src": "jquery-noop.js"
+      'id': 'jquery',
+      'src': 'jquery-noop.js'
     }, {
       id: 'angular',
       src: '/build/angular.js'

benchmarks/orderby-bp/jquery-noop.js

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

changelog.js

@@ -160,7 +160,7 @@ var writeChangelog = function(stream, commits, version) {
     if (commit.breaking) {
       sections.breaks[component] = sections.breaks[component] || [];
       sections.breaks[component].push({
-        subject: util.format("due to %s,\n %s", linkToCommit(commit.hash), commit.breaking),
+        subject: util.format('due to %s,\n %s', linkToCommit(commit.hash), commit.breaking),
         hash: commit.hash,
         closes: []
       });

compare-master-to-stable.js

@@ -21,7 +21,7 @@ var exec = function(cmd) {
 };
 
 var andThen = function(fn, after) {
-  return /* @this */ function() {
+  return /** @this */ function() {
     return fn.apply(this, arguments).then(after);
   };
 };

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

@@ -8,7 +8,7 @@ importScripts('../components/lunr.js-0.5.12/lunr.min.js');
 
 // Create the lunr index - the docs should be an array of object, each object containing
 // the path and search terms for a page
-var index = lunr(/* @this */function() {
+var index = lunr(/** @this */function() {
   this.ref('path');
   this.field('titleWords', {boost: 50});
   this.field('members', {boost: 40});

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

@@ -1,10 +1,10 @@
 'use strict';
 
-describe("doc.angularjs.org", function() {
+describe('doc.angularjs.org', function() {
 
-  describe("API pages", function() {
+  describe('API pages', function() {
 
-    it("should display links to code on GitHub", function() {
+    it('should display links to code on GitHub', function() {
       browser.get('build/docs/index.html#!/api/ng/service/$http');
       expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
 
@@ -38,7 +38,7 @@ describe("doc.angularjs.org", function() {
       expect(code.getText()).toContain('guest!!!');
     });
 
-    it("should trim indentation from code blocks", function() {
+    it('should trim indentation from code blocks', function() {
       browser.get('build/docs/index.html#!/api/ng/type/$rootScope.Scope');
 
       var codeBlocks = element.all(by.css('pre > code.lang-js'));