kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Merge pull request #17970 from hzoo/update-jscs 

v4 - Update grunt-jscs to 2.1.0 to use JSCS 2.x
This commit is contained in:
Chris Rebert 2015-10-19 13:13:21 -07:00
parent 3f947357d4 8924b5044e
commit 058802d02b
3 changed files with 723 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

852
grunt/npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

3
js/.jscsrc
View File

@ -1,5 +1,6 @@
{ {
"esnext": true, "esnext": true,
"verbose": true,
"disallowEmptyBlocks": true, "disallowEmptyBlocks": true,
"disallowKeywords": ["with"], "disallowKeywords": ["with"],
"disallowMixedSpacesAndTabs": true, "disallowMixedSpacesAndTabs": true,
@ -28,7 +29,7 @@
"requireSpaceAfterLineComment": true, "requireSpaceAfterLineComment": true,
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
"requireSpaceBetweenArguments": true, "requireSpaceBetweenArguments": true,
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true }, "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true, "allExcept": ["shorthand"] },
"requireSpacesInConditionalExpression": true, "requireSpacesInConditionalExpression": true,
"requireSpacesInForStatement": true, "requireSpacesInForStatement": true,
"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true }, "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },

2
package.json
View File

@ -50,7 +50,7 @@
"grunt-exec": "~0.4.6", "grunt-exec": "~0.4.6",
"grunt-html": "~5.0.0", "grunt-html": "~5.0.0",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~1.8.0", "grunt-jscs": "~2.1.0",
"grunt-line-remover": "0.0.2", "grunt-line-remover": "0.0.2",
"grunt-postcss": "^0.6.0", "grunt-postcss": "^0.6.0",
"grunt-sass": "^1.0.0", "grunt-sass": "^1.0.0",