Skip to content

Commit

Permalink
Merge pull request #44 from pdehaan/jscs-preset
Browse files Browse the repository at this point in the history
Switching to jscs-preset-gulp preset
  • Loading branch information
phated committed Oct 22, 2015
2 parents 09bf844 + 7773d84 commit 14db933
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 53 deletions.
47 changes: 1 addition & 46 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -1,48 +1,3 @@
{
"disallowKeywords": ["with"],
"disallowKeywordsOnNewLine": ["else"],
"disallowMixedSpacesAndTabs": true,
"disallowMultipleVarDecl": "exceptUndefined",
"disallowNewlineBeforeBlockStatements": true,
"disallowQuotedKeysInObjects": true,
"disallowSpaceAfterObjectKeys": true,
"disallowSpaceAfterPrefixUnaryOperators": true,
"disallowSpacesInFunction": {
"beforeOpeningRoundBrace": true
},
"disallowSpacesInsideParentheses": true,
"disallowTrailingWhitespace": true,
"maximumLineLength": null,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"requireCapitalizedComments": true,
"requireCapitalizedConstructors": true,
"requireCurlyBraces": true,
"requireSpaceAfterKeywords": [
"if",
"else",
"for",
"while",
"do",
"switch",
"case",
"return",
"try",
"catch",
"typeof"
],
"requireSpaceAfterLineComment": true,
"requireSpaceAfterBinaryOperators": true,
"requireSpaceBeforeBinaryOperators": true,
"requireSpaceBeforeBlockStatements": true,
"requireSpaceBeforeObjectValues": true,
"requireSpacesInFunction": {
"beforeOpeningCurlyBrace": true
},
"requireTrailingComma": {
"ignoreSingleLine": true
},
"requireBlocksOnNewline": true,
"validateIndentation": 2,
"validateLineBreaks": "LF",
"validateQuoteMarks": "'"
"preset": "gulp"
}
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ node_js:
- "0.10"
after_script:
- npm run coveralls
- npm run lint
git:
depth: 10
10 changes: 3 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"code": "^1.2.1",
"coveralls": "^2.7.0",
"gulp": ">=3.8.10",
"jscs": "^1.11.3",
"jscs": "^2.3.5",
"jscs-preset-gulp": "^1.0.0",
"jshint": "^2.5.0",
"jshint-stylish": "^2.0.1",
"lab": "^5.1.0",
Expand All @@ -55,10 +56,5 @@
"engines": {
"node": ">= 0.9"
},
"licenses": [
{
"type": "MIT",
"url": "https://raw.githubusercontent.com/gulpjs/gulp/master/LICENSE"
}
]
"license": "MIT"
}

0 comments on commit 14db933

Please sign in to comment.