Merge pull request #640 from kim-company/update-editorconfig

Update editorconfig
This commit is contained in:
Ian Gilman 2015-04-14 11:08:59 -07:00
commit b585c9e38c
3 changed files with 17 additions and 13 deletions

View File

@ -8,3 +8,7 @@ end_of_line = lf
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
[{package.json,.travis.yml,.jshintrc}]
indent_style = space
indent_size = 2

View File

@ -1,14 +1,14 @@
{ {
"browser": true, "browser": true,
"curly": true, "curly": true,
"eqeqeq": false, "eqeqeq": false,
"loopfunc": false, "loopfunc": false,
"noarg": true, "noarg": true,
"trailing": true, "trailing": true,
"undef": true, "undef": true,
"unused": false, "unused": false,
"globals": { "globals": {
"OpenSeadragon": true "OpenSeadragon": true
} }
} }

View File

@ -73,7 +73,7 @@ The report shows up at `coverage/html/index.html` viewable in a browser.
OpenSeadragon is truly a community project; we welcome your involvement! OpenSeadragon is truly a community project; we welcome your involvement!
When contributing, please attempt to match the code style already in the codebase. Note that we use four spaces per indentation stop. For more thoughts on code style, see https://github.com/rwldrn/idiomatic.js/. When contributing, please attempt to match the code style already in the codebase. Note that we use four spaces per indentation stop. For easier setup you can also install [EditorConfig](http://editorconfig.org/) if your IDE is supported. For more thoughts on code style, see [idiomatic.js](https://github.com/rwldrn/idiomatic.js/).
When fixing bugs and adding features, when appropriate please also: When fixing bugs and adding features, when appropriate please also:
@ -86,6 +86,6 @@ If you're new to open source in general, check out [GitHub's open source intro g
## License ## License
OpenSeadragon is released under the New BSD license. For details, see the file LICENSE.txt. OpenSeadragon is released under the New BSD license. For details, see the file LICENSE.txt.
[![Build Status](https://secure.travis-ci.org/openseadragon/openseadragon.png?branch=master)](http://travis-ci.org/openseadragon/openseadragon) [![Build Status](https://secure.travis-ci.org/openseadragon/openseadragon.png?branch=master)](http://travis-ci.org/openseadragon/openseadragon)