Skip to content

Commit

Permalink
Merge pull request #52 from kristerkari/feature/lint-es6
Browse files Browse the repository at this point in the history
Change linters to allow ES6 syntax
  • Loading branch information
Krister Kari committed Nov 19, 2015
2 parents c77d6c3 + 2675052 commit 931197b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
"jquery": true,
"node": true,
"amd": true,
"es6": true,
"jasmine": true
},
"ecmaFeatures": {
"modules": true
},
"globals": {
"YUI": false,
"Y": false,
Expand Down
1 change: 1 addition & 0 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"esnext": true,
"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try"],
"requireSpaceBeforeBlockStatements": true,
Expand Down
1 change: 1 addition & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"define",
"triggerEvent"
],
"esnext": true,
"forin": false,
"browser": true,
"prototypejs": true,
Expand Down

0 comments on commit 931197b

Please sign in to comment.