From ec96b58169623f4318df19e35706c683a2c39b05 Mon Sep 17 00:00:00 2001 From: Philip Giuliani Date: Mon, 13 Apr 2015 20:08:22 +0200 Subject: [PATCH 1/4] Update to match default jshintrc style --- .jshintrc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.jshintrc b/.jshintrc index 2c3f7d32..e40e7d81 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,14 +1,14 @@ { - "browser": true, - "curly": true, - "eqeqeq": false, - "loopfunc": false, - "noarg": true, - "trailing": true, - "undef": true, - "unused": false, + "browser": true, + "curly": true, + "eqeqeq": false, + "loopfunc": false, + "noarg": true, + "trailing": true, + "undef": true, + "unused": false, - "globals": { - "OpenSeadragon": true - } + "globals": { + "OpenSeadragon": true + } } From d14ba88b70b6023f4f8b7749370b64536fba48ea Mon Sep 17 00:00:00 2001 From: Philip Giuliani Date: Mon, 13 Apr 2015 20:08:31 +0200 Subject: [PATCH 2/4] Add better config --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index 8f960391..6c76c202 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,3 +8,7 @@ end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true + +[{package.json,.travis.yml,.jshintrc}] +indent_style = space +indent_size = 2 From cf0a43d797f57b900be3558b6acaab5445716faf Mon Sep 17 00:00:00 2001 From: Philip Giuliani Date: Mon, 13 Apr 2015 20:08:40 +0200 Subject: [PATCH 3/4] :memo: Update README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 75fc5c92..2a18547b 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,8 @@ The report shows up at `coverage/html/index.html` viewable in a browser. 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: @@ -86,6 +87,6 @@ If you're new to open source in general, check out [GitHub's open source intro g ## 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) From fc827e9e8c03eb0a940a58f50419a16f276adc06 Mon Sep 17 00:00:00 2001 From: Philip Giuliani Date: Tue, 14 Apr 2015 20:05:55 +0200 Subject: [PATCH 4/4] Fix idiomatic.js line --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 2a18547b..efb8b4be 100644 --- a/README.md +++ b/README.md @@ -73,8 +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! -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 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: