Skip to content

Commit

Permalink
Merge pull request #82 from rhubarbselleven/syncWithMarionette
Browse files Browse the repository at this point in the history
Updates to key supporting configs
  • Loading branch information
rhubarbselleven committed Feb 25, 2015
2 parents 2c0f99a + 6aa1c0c commit aefec1c
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 15 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; EditorConfig is awesome: http://EditorConfig.org

root = true;

[*]
trim_trailing_whitespace = true
insert_final_newline = true

[*.js]
indent_style = space
indent_size = 2
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
*.swp
*.swo
*.orig
.idea
*.iml
tmp/
ext/
node_modules
bower_components
node_modules/
coverage/
.grunt/
npm-debug.log
bower_components/
.grunt
23 changes: 13 additions & 10 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"globals": {
"define" : true,
"require" : true,
"module" : true,
"exports" : true,
"$" : true,
"jQuery" : true,
"_" : true,
"Backbone" : true,
"Syphon" : true,
"TypeRegistry" : true
"define" : true,
"require" : true,
"module" : true,
"exports" : true,
"$" : true,
"jQuery" : true,
"_" : true,
"Backbone" : true,
"Syphon" : true,
"TypeRegistry": true
},

"bitwise" : true,
Expand All @@ -24,6 +24,7 @@
"newcap" : true,
"noarg" : true,
"noempty" : true,
"nonbsp" : true,
"nonew" : true,
"plusplus" : false,
"quotmark" : "single",
Expand Down Expand Up @@ -53,13 +54,15 @@
"loopfunc" : false,
"maxerr" : 50,
"multistr" : false,
"notypeof" : false,
"proto" : false,
"scripturl" : false,
"smarttabs" : false,
"shadow" : false,
"sub" : false,
"supernew" : false,
"validthis" : false,
"noyield" : false,

"browser" : true,
"couch" : false,
Expand Down
14 changes: 11 additions & 3 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
api
bower_components
src
spec
.editorconfig
.gitignore
.jshintrc
.travis.yml
bower.json
component.json
CONTRIBUTING.md
Gruntfile.js
SpecRunner.html
.jshintrc
spec/
SpecRunner.html

0 comments on commit aefec1c

Please sign in to comment.