diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0e288e8895e..8f779935a222 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -120,7 +120,7 @@ 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): @@ -238,7 +238,7 @@ reference GitHub issues that this commit **Closes**. A detailed explanation can be found in this [document][commit-message-format]. -## Signing the CLA +## 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! diff --git a/TRIAGING.md b/TRIAGING.md index aeddba6c8003..c755ba7201c9 100644 --- a/TRIAGING.md +++ b/TRIAGING.md @@ -61,9 +61,9 @@ This process based on the idea of minimizing user pain 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 diff --git a/docs/app/assets/css/prettify.css b/docs/app/assets/css/prettify.css index 16e0cafbfef9..354bbd544f11 100644 --- a/docs/app/assets/css/prettify.css +++ b/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; diff --git a/docs/app/assets/js/angular-bootstrap/bootstrap.js b/docs/app/assets/js/angular-bootstrap/bootstrap.js index 6b60a8f5274d..58aedde697e6 100644 --- a/docs/app/assets/js/angular-bootstrap/bootstrap.js +++ b/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 }}' + ' ' + ''; @@ -103,7 +103,7 @@ directive.syntax = function() { restrict: 'A', link: function(scope, element, attrs) { function makeLink(type, text, link, icon) { - return '' + + return '' + ' ' + text + ''; }; @@ -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); } diff --git a/docs/app/src/app.js b/docs/app/src/app.js index 0ac5f258fd73..3015be958668 100644 --- a/docs/app/src/app.js +++ b/docs/app/src/app.js @@ -20,4 +20,4 @@ angular.module('docsApp', [ .config(function($locationProvider) { $locationProvider.html5Mode(true).hashPrefix('!'); -}); \ No newline at end of file +}); diff --git a/docs/app/src/errors.js b/docs/app/src/errors.js index b91cfb81493e..bd7f6bbeef83 100644 --- a/docs/app/src/errors.js +++ b/docs/app/src/errors.js @@ -59,4 +59,4 @@ angular.module('errors', ['ngSanitize']) element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank')); } }; -}]); \ No newline at end of file +}]); diff --git a/docs/app/src/examples.js b/docs/app/src/examples.js index ee762eba4093..b39acb895c8c 100644 --- a/docs/app/src/examples.js +++ b/docs/app/src/examples.js @@ -69,4 +69,4 @@ angular.module('examples', []) formPostData('http://plnkr.co/edit/?p=preview', postData); }); }; -}]); \ No newline at end of file +}]); diff --git a/docs/app/src/navigationService.js b/docs/app/src/navigationService.js index a05f6788384c..fbee1801961c 100644 --- a/docs/app/src/navigationService.js +++ b/docs/app/src/navigationService.js @@ -21,4 +21,4 @@ angular.module('docsApp.navigationService', []) } }; -}); \ No newline at end of file +}); diff --git a/docs/app/src/versions.js b/docs/app/src/versions.js index 186a155570b1..f67522e0ffa1 100644 --- a/docs/app/src/versions.js +++ b/docs/app/src/versions.js @@ -28,4 +28,4 @@ angular.module('versions', []) $window.location = version.docsUrl + currentPagePath; }; -}]); \ No newline at end of file +}]); diff --git a/docs/app/test/docsSpec.js b/docs/app/test/docsSpec.js index 732f51164461..bf635bf87927 100644 --- a/docs/app/test/docsSpec.js +++ b/docs/app/test/docsSpec.js @@ -31,4 +31,4 @@ describe("DocsController", function() { expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']); })); }); -}); \ No newline at end of file +}); diff --git a/docs/config/index.js b/docs/config/index.js index 767d6b77b97c..f0e798ecb942 100644 --- a/docs/config/index.js +++ b/docs/config/index.js @@ -9,7 +9,7 @@ module.exports = function(config) { config = basePackage(config); config = examplesPackage(config); - + config.append('processing.processors', [ require('./processors/git-data'), require('./processors/error-docs'), diff --git a/docs/config/processors/debug-dump.js b/docs/config/processors/debug-dump.js index 4dd82bcf5499..5111a0f973c7 100644 --- a/docs/config/processors/debug-dump.js +++ b/docs/config/processors/debug-dump.js @@ -30,4 +30,4 @@ function writeFile(file, content) { return fs.makeTree(fs.directory(file)).then(function() { return fs.write(file, content, 'wb'); }); -} \ No newline at end of file +} diff --git a/docs/config/processors/error-docs.js b/docs/config/processors/error-docs.js index 9df3339889d5..68a082b77aa3 100644 --- a/docs/config/processors/error-docs.js +++ b/docs/config/processors/error-docs.js @@ -56,4 +56,4 @@ module.exports = { return docs.concat(_.values(errorNamespaces)); } -}; \ No newline at end of file +}; diff --git a/docs/config/processors/git-data.js b/docs/config/processors/git-data.js index 845f5c94f491..44d423375768 100644 --- a/docs/config/processors/git-data.js +++ b/docs/config/processors/git-data.js @@ -17,4 +17,4 @@ module.exports = { process: function(extraData, gitData) { extraData.git = gitData; } -}; \ No newline at end of file +}; diff --git a/docs/config/processors/keywords.js b/docs/config/processors/keywords.js index 6e3725d20923..7b3dd7e6fd8f 100644 --- a/docs/config/processors/keywords.js +++ b/docs/config/processors/keywords.js @@ -85,4 +85,4 @@ module.exports = { }); } -}; \ No newline at end of file +}; diff --git a/docs/config/processors/versions-data.js b/docs/config/processors/versions-data.js index 14357fd7d541..c9494c645c21 100644 --- a/docs/config/processors/versions-data.js +++ b/docs/config/processors/versions-data.js @@ -35,4 +35,4 @@ module.exports = { docs.push(versionDoc); } -}; \ No newline at end of file +}; diff --git a/docs/config/templates/error.template.html b/docs/config/templates/error.template.html index f48b397b87e7..91593d2f30d9 100644 --- a/docs/config/templates/error.template.html +++ b/docs/config/templates/error.template.html @@ -14,4 +14,4 @@

Description

{$ doc.description | marked $} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/docs/config/templates/errorNamespace.template.html b/docs/config/templates/errorNamespace.template.html index ebd48e049c54..ae319ca98dad 100644 --- a/docs/config/templates/errorNamespace.template.html +++ b/docs/config/templates/errorNamespace.template.html @@ -25,4 +25,4 @@

{$ doc.name $}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/docs/config/templates/protractorTests.template.js b/docs/config/templates/protractorTests.template.js index 48f682a45114..1801486501a2 100644 --- a/docs/config/templates/protractorTests.template.js +++ b/docs/config/templates/protractorTests.template.js @@ -4,4 +4,4 @@ describe("{$ doc.description $}", function() { }); {$ doc.innerTest $} -}); \ No newline at end of file +}); diff --git a/docs/config/templates/runnableExample.template.html b/docs/config/templates/runnableExample.template.html index b4f568a68350..d035c08d65e0 100644 --- a/docs/config/templates/runnableExample.template.html +++ b/docs/config/templates/runnableExample.template.html @@ -24,4 +24,4 @@ {# Be aware that we need these extra new lines here or marked will not realise that the
- above is HTML and wrap each line in a

- thus breaking the HTML #} \ No newline at end of file + above is HTML and wrap each line in a

- thus breaking the HTML #} diff --git a/docs/config/templates/tutorial.template.html b/docs/config/templates/tutorial.template.html index 14566bbb501c..c40bfb60a1bc 100644 --- a/docs/config/templates/tutorial.template.html +++ b/docs/config/templates/tutorial.template.html @@ -1 +1 @@ -{% include 'overview.template.html' %} \ No newline at end of file +{% include 'overview.template.html' %} diff --git a/docs/content/error/$injector/cdep.ngdoc b/docs/content/error/$injector/cdep.ngdoc index 0e6526b87adf..a7977dda5f21 100644 --- a/docs/content/error/$injector/cdep.ngdoc +++ b/docs/content/error/$injector/cdep.ngdoc @@ -23,4 +23,4 @@ When an instance of `MyCtrl` is created, the service `myService` will be created by the `$injector`. `myService` depends on itself, which causes the `$injector` to detect a circular dependency and throw the error. -For more information, see the {@link guide/di Dependency Injection Guide}. \ No newline at end of file +For more information, see the {@link guide/di Dependency Injection Guide}. diff --git a/docs/content/error/$injector/itkn.ngdoc b/docs/content/error/$injector/itkn.ngdoc index 5437dce713bf..dcae73b9b57b 100644 --- a/docs/content/error/$injector/itkn.ngdoc +++ b/docs/content/error/$injector/itkn.ngdoc @@ -23,4 +23,4 @@ To avoid the error, always use string literals for dependency injection annotati tokens. For an explanation of what injection annotations are and how to use them, refer -to the {@link guide/di Dependency Injection Guide}. \ No newline at end of file +to the {@link guide/di Dependency Injection Guide}. diff --git a/docs/content/error/$injector/pget.ngdoc b/docs/content/error/$injector/pget.ngdoc index 5dbf05c70543..620fa098a4f4 100644 --- a/docs/content/error/$injector/pget.ngdoc +++ b/docs/content/error/$injector/pget.ngdoc @@ -23,4 +23,4 @@ angular.module("myApp", []) ``` For more information, refer to the {@link auto.$provide#provider -$provide.provider} api doc. \ No newline at end of file +$provide.provider} api doc. diff --git a/docs/content/error/$injector/unpr.ngdoc b/docs/content/error/$injector/unpr.ngdoc index 0442be25bb58..e177d8cc6da5 100644 --- a/docs/content/error/$injector/unpr.ngdoc +++ b/docs/content/error/$injector/unpr.ngdoc @@ -14,7 +14,7 @@ angular.module('myApp', []) }]); ``` -The above code will fail with `$injector:unpr` if `myService` is not defined. +The above code will fail with `$injector:unpr` if `myService` is not defined. Making sure each dependency is defined will fix the problem, as noted below. diff --git a/docs/content/error/$interpolate/noconcat.ngdoc b/docs/content/error/$interpolate/noconcat.ngdoc index 0853544e56be..dccbf17e4042 100644 --- a/docs/content/error/$interpolate/noconcat.ngdoc +++ b/docs/content/error/$interpolate/noconcat.ngdoc @@ -9,4 +9,4 @@ it hard to reason about whether some combination of concatenated values are unsafe to use and could easily lead to XSS. For more information about how AngularJS helps keep your app secure, refer to -the {@link ng.$sce $sce} API doc. \ No newline at end of file +the {@link ng.$sce $sce} API doc. diff --git a/docs/content/error/$parse/isecff.ngdoc b/docs/content/error/$parse/isecff.ngdoc index d06d259c8b95..a1e72775d254 100644 --- a/docs/content/error/$parse/isecff.ngdoc +++ b/docs/content/error/$parse/isecff.ngdoc @@ -14,4 +14,4 @@ Example expression that would result in this error: ```

{{user.sendInfo.call({}, true)}}
-``` \ No newline at end of file +``` diff --git a/docs/content/error/$parse/isecfld.ngdoc b/docs/content/error/$parse/isecfld.ngdoc index f37bac2722f7..a19c5fa51e97 100644 --- a/docs/content/error/$parse/isecfld.ngdoc +++ b/docs/content/error/$parse/isecfld.ngdoc @@ -24,4 +24,4 @@ Example expressions that would result in this error:
{{user.__proto__.hasOwnProperty = $emit}}
{{user.__defineGetter__('name', noop)}}
-``` \ No newline at end of file +``` diff --git a/docs/content/error/$resource/badname.ngdoc b/docs/content/error/$resource/badname.ngdoc index 99f73bdc77cd..cde2c0d216f1 100644 --- a/docs/content/error/$resource/badname.ngdoc +++ b/docs/content/error/$resource/badname.ngdoc @@ -5,4 +5,4 @@ Occurs when you try to use the name `hasOwnProperty` as a name of a parameter. Generally, a name cannot be `hasOwnProperty` because it is used, internally, on a object -and allowing such a name would break lookups on this object. \ No newline at end of file +and allowing such a name would break lookups on this object. diff --git a/docs/content/error/ng/areq.ngdoc b/docs/content/error/ng/areq.ngdoc index fbc45d8a13f2..376ac035c00a 100644 --- a/docs/content/error/ng/areq.ngdoc +++ b/docs/content/error/ng/areq.ngdoc @@ -5,4 +5,4 @@ AngularJS often asserts that certain values will be present and truthy using a helper function. If the assertion fails, this error is thrown. To fix this problem, -make sure that the value the assertion expects is defined and truthy. \ No newline at end of file +make sure that the value the assertion expects is defined and truthy. diff --git a/docs/content/error/ng/badname.ngdoc b/docs/content/error/ng/badname.ngdoc index 5d3a6f616981..ab67236a9d22 100644 --- a/docs/content/error/ng/badname.ngdoc +++ b/docs/content/error/ng/badname.ngdoc @@ -5,4 +5,4 @@ Occurs when you try to use the name `hasOwnProperty` in a context where it is not allow. Generally, a name cannot be `hasOwnProperty` because it is used, internally, on a object -and allowing such a name would break lookups on this object. \ No newline at end of file +and allowing such a name would break lookups on this object. diff --git a/docs/content/error/ng/btstrpd.ngdoc b/docs/content/error/ng/btstrpd.ngdoc index a5455eb9bf55..97af898b2caa 100644 --- a/docs/content/error/ng/btstrpd.ngdoc +++ b/docs/content/error/ng/btstrpd.ngdoc @@ -49,4 +49,4 @@ You can also get this error if you accidentally load AngularJS itself more than -``` \ No newline at end of file +``` diff --git a/docs/content/error/ng/cpi.ngdoc b/docs/content/error/ng/cpi.ngdoc index 5d41ee641fa7..568b500d419f 100644 --- a/docs/content/error/ng/cpi.ngdoc +++ b/docs/content/error/ng/cpi.ngdoc @@ -7,4 +7,4 @@ This error occurs when attempting to copy an object to itself. Calling {@link api/angular.copy angular.copy} with a `destination` object deletes all of the elements or properties on `destination` before copying to it. Copying an object to itself is not supported. Make sure to check your calls to -`angular.copy` and avoid copying objects or arrays to themselves. \ No newline at end of file +`angular.copy` and avoid copying objects or arrays to themselves. diff --git a/docs/content/error/ng/cpws.ngdoc b/docs/content/error/ng/cpws.ngdoc index 59b9ffac80c0..6d81bc3ad773 100644 --- a/docs/content/error/ng/cpws.ngdoc +++ b/docs/content/error/ng/cpws.ngdoc @@ -7,4 +7,4 @@ Copying Window or Scope instances is not supported because of cyclical and self references. Avoid copying windows and scopes, as well as any other cyclical or self-referential structures. Note that trying to deep copy an object containing cyclical references that is neither a window nor a scope will cause infinite -recursion and a stack overflow. \ No newline at end of file +recursion and a stack overflow. diff --git a/docs/content/guide/compiler.ngdoc b/docs/content/guide/compiler.ngdoc index 6dfe2cfb407b..32ceea1d2fc3 100644 --- a/docs/content/guide/compiler.ngdoc +++ b/docs/content/guide/compiler.ngdoc @@ -198,7 +198,7 @@ This should help give you an idea of what Angular does internally. // Step 3: link the compiled template with the scope. var element = linkFn(scope); - + // Step 4: Append to DOM (optional) parent.appendChild(element); ``` diff --git a/docs/content/guide/migration.ngdoc b/docs/content/guide/migration.ngdoc index a602567edb1b..c3972ec9ad05 100644 --- a/docs/content/guide/migration.ngdoc +++ b/docs/content/guide/migration.ngdoc @@ -143,8 +143,8 @@ jQuery. We don't expect that app code actually depends on this accidental featur - **jqLite:** due to [d71dbb1a](https://github.com/angular/angular.js/commit/d71dbb1ae50f174680533492ce4c7db3ff74df00), the jQuery `detach()` method does not trigger the `$destroy` event. If you want to destroy Angular data attached to the element, use `remove()`. - - + + - **$http:** due to [ad4336f9](https://github.com/angular/angular.js/commit/ad4336f9359a073e272930f8f9bcd36587a8648f), diff --git a/docs/content/misc/downloading.ngdoc b/docs/content/misc/downloading.ngdoc index 4441fe363953..1185da004afe 100644 --- a/docs/content/misc/downloading.ngdoc +++ b/docs/content/misc/downloading.ngdoc @@ -83,4 +83,4 @@ after the core `angular.js` file: our docs, or even more importantly, view the docs offline. * __`i18n`__ - this directory contains locale specific `ngLocale` angular modules to override the defaults -defined in the `ng` module. \ No newline at end of file +defined in the `ng` module. diff --git a/docs/content/tutorial/step_02.ngdoc b/docs/content/tutorial/step_02.ngdoc index 5017ba688ce0..b38fe2dc9a44 100644 --- a/docs/content/tutorial/step_02.ngdoc +++ b/docs/content/tutorial/step_02.ngdoc @@ -255,4 +255,4 @@ to the app. [jasmine]: http://jasmine.github.io/ [jasmine-docs]: http://jasmine.github.io/1.3/introduction.html -[karma]: http://karma-runner.github.io/ \ No newline at end of file +[karma]: http://karma-runner.github.io/ diff --git a/docs/content/tutorial/step_07.ngdoc b/docs/content/tutorial/step_07.ngdoc index c25891a977d5..4d14ff77da71 100644 --- a/docs/content/tutorial/step_07.ngdoc +++ b/docs/content/tutorial/step_07.ngdoc @@ -80,14 +80,14 @@ AngularJS, so it's important for you to understand a thing or two about how it w When the application bootstraps, Angular creates an injector that will be used to find and inject all of the services that are required by your app. The injector itself doesn't know anything about what -`$http` or `$route` services do, in fact it doesn't even know about the existence of these services -unless it is configured with proper module definitions. +`$http` or `$route` services do, in fact it doesn't even know about the existence of these services +unless it is configured with proper module definitions. -The injector only carries out the following steps : +The injector only carries out the following steps : * load the module definition(s) that you specify in your app * register all Providers defined in these module definitions - * when asked to do so, inject a specified function and any necessary dependencies (services) that + * when asked to do so, inject a specified function and any necessary dependencies (services) that it lazily instantiates via their Providers. Providers are objects that provide (create) instances of services and expose configuration APIs diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js index dd6062e6b215..3f8458d392a4 100644 --- a/src/ngResource/resource.js +++ b/src/ngResource/resource.js @@ -310,20 +310,20 @@ function shallowClearAndCopy(src, dst) { * # Creating a custom 'PUT' request * In this example we create a custom method on our resource to make a PUT request * ```js - * var app = angular.module('app', ['ngResource', 'ngRoute']); + * var app = angular.module('app', ['ngResource', 'ngRoute']); * - * // Some APIs expect a PUT request in the format URL/object/ID - * // Here we are creating an 'update' method - * app.factory('Notes', ['$resource', function($resource) { + * // Some APIs expect a PUT request in the format URL/object/ID + * // Here we are creating an 'update' method + * app.factory('Notes', ['$resource', function($resource) { * return $resource('/notes/:id', null, * { * 'update': { method:'PUT' } * }); - * }]); + * }]); * - * // In our controller we get the ID from the URL using ngRoute and $routeParams - * // We pass in $routeParams and our Notes factory along with $scope - * app.controller('NotesCtrl', ['$scope', '$routeParams', 'Notes', + * // In our controller we get the ID from the URL using ngRoute and $routeParams + * // We pass in $routeParams and our Notes factory along with $scope + * app.controller('NotesCtrl', ['$scope', '$routeParams', 'Notes', function($scope, $routeParams, Notes) { * // First get a note object from the factory * var note = Notes.get({ id:$routeParams.id }); @@ -333,7 +333,7 @@ function shallowClearAndCopy(src, dst) { * Notes.update({ id:$id }, note); * * // This will PUT /notes/ID with the note object in the request payload - * }]); + * }]); * ``` */ angular.module('ngResource', ['ng']). diff --git a/test/ng/filter/filtersSpec.js b/test/ng/filter/filtersSpec.js index 5ed1b8a1667b..af0cdba6d96d 100644 --- a/test/ng/filter/filtersSpec.js +++ b/test/ng/filter/filtersSpec.js @@ -73,16 +73,16 @@ describe('filters', function() { expect(num).toBe('123.112'); }); - it('should format the same with string as well as numeric fractionSize', function(){ - var num = formatNumber(123.1, pattern, ',', '.', "0"); + it('should format the same with string as well as numeric fractionSize', function(){ + var num = formatNumber(123.1, pattern, ',', '.', "0"); expect(num).toBe('123'); - num = formatNumber(123.1, pattern, ',', '.', 0); + num = formatNumber(123.1, pattern, ',', '.', 0); expect(num).toBe('123'); - num = formatNumber(123.1, pattern, ',', '.', "3"); + num = formatNumber(123.1, pattern, ',', '.', "3"); expect(num).toBe('123.100'); - num = formatNumber(123.1, pattern, ',', '.', 3); + num = formatNumber(123.1, pattern, ',', '.', 3); expect(num).toBe('123.100'); - }); + }); }); describe('currency', function() { diff --git a/test/ngScenario/e2e/Runner.html b/test/ngScenario/e2e/Runner.html index 9065380ea4ea..f5d03ca5e4bc 100644 --- a/test/ngScenario/e2e/Runner.html +++ b/test/ngScenario/e2e/Runner.html @@ -1,7 +1,7 @@ - +