Skip to content
Open
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
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Feature Request

Please search the issue list first to see if your feature has already been
requested. All features are tagged with the tag `enhancement`. If there already
is an enchancement ticket, you can vote on it by putting in a +/-1 comment. If
is an enhancement ticket, you can vote on it by putting in a +/-1 comment. If
you cannot find the `enhancement` you are looking for, you can open a new issue.

Please prefix the subject line with **[Feature Request]** so your issue will
Expand Down Expand Up @@ -64,13 +64,13 @@ Code Style
==========
If you are filing a pull request, you should follow the guidelines below:

Javascript
JavaScript
----------

Please be aware that Backgrid.js uses 2 spaces for indentation. This project has
a [.jshintrc](.jshintrc) file defined, which is handy if you use
[jshint](http://www.jshint.com). In general, you should follow the
[Google Javascript Style Guide](http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml). Backgrid.js's
[Google JavaScript Style Guide](http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml). Backgrid.js's
code follows this coding style extremely closely, with 2 exceptions:

- `else` should be on its own line instead of the same line of the close `}` of
Expand Down Expand Up @@ -107,10 +107,10 @@ Documentation
=============

If you make any changes to the documentation, since Backgrid.js uses
[Github Pages](http://pages.github.com), please do so in your `gh-pages` branch
[GitHub Pages](http://pages.github.com), please do so in your `gh-pages` branch
and submit a pull request from that branch.

If you change any Javascript comment documentation, you should rebuild the API
If you change any JavaScript comment documentation, you should rebuild the API
document. There is also a Grunt task for this purpose, but make sure you have
installed [JSDuck](https://github.com/senchalabs/jsduck) first.

Expand Down
6 changes: 3 additions & 3 deletions test/paginator.js
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ describe("A Paginator", function () {
expect(paginator.$el.find("a[title='Page 2']").length).toBe(0);
});

it("renders the overriden control page handle labels and titles", function () {
it("renders the overridden control page handle labels and titles", function () {
paginator = new (Backgrid.Extension.Paginator.extend({
controls: {
back: {
Expand Down Expand Up @@ -704,7 +704,7 @@ describe("A Paginator", function () {
expect(paginator.$el.find("a[title='Page 3']").length).toBe(1);
});

it("renders the overriden control page handle labels and titles", function () {
it("renders the overridden control page handle labels and titles", function () {
paginator = new (Backgrid.Extension.Paginator.extend({
controls: {
back: {
Expand Down Expand Up @@ -766,7 +766,7 @@ describe("A Paginator", function () {
paginator.render();
});

it("renders the overriden control page handle labels and titles", function () {
it("renders the overridden control page handle labels and titles", function () {
paginator = new (Backgrid.Extension.Paginator.extend({
controls: {
back: {
Expand Down