Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Fix whitespace #8277

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -238,7 +238,7 @@ 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!
Expand Down
4 changes: 2 additions & 2 deletions TRIAGING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/app/assets/css/prettify.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions docs/app/assets/js/angular-bootstrap/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>';
Expand Down Expand Up @@ -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>';
};
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion docs/app/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ angular.module('docsApp', [

.config(function($locationProvider) {
$locationProvider.html5Mode(true).hashPrefix('!');
});
});
2 changes: 1 addition & 1 deletion docs/app/src/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ angular.module('errors', ['ngSanitize'])
element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank'));
}
};
}]);
}]);
2 changes: 1 addition & 1 deletion docs/app/src/examples.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ angular.module('examples', [])
formPostData('http://plnkr.co/edit/?p=preview', postData);
});
};
}]);
}]);
2 changes: 1 addition & 1 deletion docs/app/src/navigationService.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ angular.module('docsApp.navigationService', [])

}
};
});
});
2 changes: 1 addition & 1 deletion docs/app/src/versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ angular.module('versions', [])

$window.location = version.docsUrl + currentPagePath;
};
}]);
}]);
2 changes: 1 addition & 1 deletion docs/app/test/docsSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ describe("DocsController", function() {
expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']);
}));
});
});
});
2 changes: 1 addition & 1 deletion docs/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion docs/config/processors/debug-dump.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ function writeFile(file, content) {
return fs.makeTree(fs.directory(file)).then(function() {
return fs.write(file, content, 'wb');
});
}
}
2 changes: 1 addition & 1 deletion docs/config/processors/error-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ module.exports = {

return docs.concat(_.values(errorNamespaces));
}
};
};
2 changes: 1 addition & 1 deletion docs/config/processors/git-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ module.exports = {
process: function(extraData, gitData) {
extraData.git = gitData;
}
};
};
2 changes: 1 addition & 1 deletion docs/config/processors/keywords.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ module.exports = {
});

}
};
};
2 changes: 1 addition & 1 deletion docs/config/processors/versions-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ module.exports = {

docs.push(versionDoc);
}
};
};
2 changes: 1 addition & 1 deletion docs/config/templates/error.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ <h2>Description</h2>
{$ doc.description | marked $}
</div>

{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion docs/config/templates/errorNamespace.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ <h1>{$ doc.name $}</h1>
</div>
</div>

{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion docs/config/templates/protractorTests.template.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ describe("{$ doc.description $}", function() {
});

{$ doc.innerTest $}
});
});
2 changes: 1 addition & 1 deletion docs/config/templates/runnableExample.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
</div>

{# Be aware that we need these extra new lines here or marked will not realise that the <div>
above is HTML and wrap each line in a <p> - thus breaking the HTML #}
above is HTML and wrap each line in a <p> - thus breaking the HTML #}
2 changes: 1 addition & 1 deletion docs/config/templates/tutorial.template.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{% include 'overview.template.html' %}
{% include 'overview.template.html' %}
2 changes: 1 addition & 1 deletion docs/content/error/$injector/cdep.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
For more information, see the {@link guide/di Dependency Injection Guide}.
2 changes: 1 addition & 1 deletion docs/content/error/$injector/itkn.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
to the {@link guide/di Dependency Injection Guide}.
2 changes: 1 addition & 1 deletion docs/content/error/$injector/pget.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ angular.module("myApp", [])
```

For more information, refer to the {@link auto.$provide#provider
$provide.provider} api doc.
$provide.provider} api doc.
2 changes: 1 addition & 1 deletion docs/content/error/$injector/unpr.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/noconcat.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
the {@link ng.$sce $sce} API doc.
2 changes: 1 addition & 1 deletion docs/content/error/$parse/isecff.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ Example expression that would result in this error:

```
<div>{{user.sendInfo.call({}, true)}}</div>
```
```
2 changes: 1 addition & 1 deletion docs/content/error/$parse/isecfld.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ Example expressions that would result in this error:
<div>{{user.__proto__.hasOwnProperty = $emit}}</div>

<div>{{user.__defineGetter__('name', noop)}}</div>
```
```
2 changes: 1 addition & 1 deletion docs/content/error/$resource/badname.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
and allowing such a name would break lookups on this object.
2 changes: 1 addition & 1 deletion docs/content/error/ng/areq.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
make sure that the value the assertion expects is defined and truthy.
2 changes: 1 addition & 1 deletion docs/content/error/ng/badname.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
and allowing such a name would break lookups on this object.
2 changes: 1 addition & 1 deletion docs/content/error/ng/btstrpd.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ You can also get this error if you accidentally load AngularJS itself more than
<script src="angular.js"></script>
</body>
</html>
```
```
2 changes: 1 addition & 1 deletion docs/content/error/ng/cpi.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
`angular.copy` and avoid copying objects or arrays to themselves.
2 changes: 1 addition & 1 deletion docs/content/error/ng/cpws.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
recursion and a stack overflow.
2 changes: 1 addition & 1 deletion docs/content/guide/compiler.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
```
Expand Down
4 changes: 2 additions & 2 deletions docs/content/guide/migration.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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),


Expand Down
2 changes: 1 addition & 1 deletion docs/content/misc/downloading.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
defined in the `ng` module.
2 changes: 1 addition & 1 deletion docs/content/tutorial/step_02.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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/
[karma]: http://karma-runner.github.io/
8 changes: 4 additions & 4 deletions docs/content/tutorial/step_07.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions src/ngResource/resource.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand All @@ -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']).
Expand Down
12 changes: 6 additions & 6 deletions test/ng/filter/filtersSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/ngScenario/e2e/Runner.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="expires" content="0">
<meta http-equiv="expires" content="0">
<script type="text/javascript" src="../../../src/scenario/angular-bootstrap.js" ng-autotest></script>
<script type="text/javascript" src="widgets-scenario.js"></script>
</head>
Expand Down