Skip to content

Commit 4736bb7

Browse files
committed
Updated dev dependencies; code style cleanup
1 parent e73016f commit 4736bb7

17 files changed

+499
-407
lines changed

.jscs.json

Lines changed: 58 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,66 @@
11
{
2-
"requireCurlyBraces": ["for", "while", "do", "try", "catch"],
3-
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try"],
4-
"disallowLeftStickedOperators": ["?", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
5-
"disallowRightStickedOperators": ["?", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
6-
"requireRightStickedOperators": ["!", "++", "--"],
7-
"requireLeftStickedOperators": [",", "++", "--"],
2+
"disallowEmptyBlocks": {
3+
"allExcept": ["comments"]
4+
},
85
"disallowImplicitTypeConversion": [],
96
"disallowKeywords": ["with"],
10-
"disallowMultipleLineBreaks": true,
117
"disallowKeywordsOnNewLine": [],
8+
"disallowMixedSpacesAndTabs": true,
9+
"disallowMultipleLineBreaks": true,
10+
"disallowNewlineBeforeBlockStatements": true,
11+
"disallowOperatorBeforeLineBreak": ["."],
12+
"disallowSpaceAfterObjectKeys": true,
13+
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "~", "!"],
14+
"disallowSpaceBeforeBinaryOperators": [","],
15+
"disallowSpaceBeforeComma": true,
16+
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
17+
"disallowSpaceBeforeSemicolon": true,
18+
"disallowSpacesInCallExpression": true,
19+
"disallowSpacesInFunctionDeclaration": {
20+
"beforeOpeningRoundBrace": true
21+
},
22+
"disallowSpacesInNamedFunctionExpression": {
23+
"beforeOpeningRoundBrace": true
24+
},
25+
"disallowSpacesInsideBrackets": {
26+
"allExcept": ["[", "]", "{", "}"]
27+
},
28+
"disallowTrailingWhitespace": true,
29+
"disallowYodaConditions": true,
30+
"requireBlocksOnNewline": 1,
31+
"requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
32+
"requireCapitalizedConstructors": true,
33+
"requireCommaBeforeLineBreak": true,
34+
"requireCurlyBraces": ["for", "while", "do", "try", "catch"],
1235
"requireKeywordsOnNewLine": ["else"],
36+
"requireLineBreakAfterVariableAssignment": true,
1337
"requireLineFeedAtFileEnd": true,
1438
"requireParenthesesAroundIIFE": true,
15-
"disallowSpaceAfterObjectKeys": true,
16-
"requireCommaBeforeLineBreak": true,
17-
"disallowMixedSpacesAndTabs": true,
18-
"disallowTrailingWhitespace": true
39+
"requireSemicolons": true,
40+
"requireSpaceAfterBinaryOperators": ["=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
41+
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "case", "return", "try", "catch", "void", "with", "typeof"],
42+
"requireSpaceAfterLineComment": {
43+
"allExcept": ["#", "="]
44+
},
45+
"requireSpaceBeforeBinaryOperators": ["=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
46+
"requireSpaceBeforeBlockStatements": true,
47+
"requireSpaceBeforeObjectValues": true,
48+
"requireSpaceBetweenArguments": true,
49+
"requireSpacesInConditionalExpression": {
50+
"afterTest": true,
51+
"beforeConsequent": true,
52+
"afterConsequent": true,
53+
"beforeAlternate": true
54+
},
55+
"requireSpacesInForStatement": true,
56+
"requireSpacesInFunction": {
57+
"beforeOpeningCurlyBrace": true
58+
},
59+
"requireSpacesInFunctionExpression": {
60+
"beforeOpeningCurlyBrace": true
61+
},
62+
"validateQuoteMarks": {
63+
"escape": true,
64+
"mark": "'"
65+
}
1966
}

Gruntfile.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
99
pkg: grunt.file.readJSON('package.json'),
1010
concat: {
1111
options: {
12-
banner: banner + "\n",
12+
banner: banner + '\n',
1313
separator: grunt.util.linefeed,
1414
},
1515
target: {
@@ -18,8 +18,8 @@ module.exports = function(grunt) {
1818
'src/core.js',
1919
'src/images.js',
2020
'src/filters.js',
21-
//'src/gaussian.js',
22-
//'src/weightedBoxBlurGaussian.js',
21+
// 'src/gaussian.js',
22+
// 'src/weightedBoxBlurGaussian.js',
2323
'src/generators.js',
2424
'src/materials.js',
2525
'src/scatter.js',
@@ -112,7 +112,7 @@ module.exports = function(grunt) {
112112
grunt.loadNpmTasks('grunt-contrib-concat');
113113
grunt.loadNpmTasks('grunt-contrib-uglify');
114114
grunt.loadNpmTasks('grunt-contrib-jshint');
115-
grunt.loadNpmTasks("grunt-jscs-checker");
115+
grunt.loadNpmTasks('grunt-jscs');
116116
grunt.loadNpmTasks('grunt-contrib-watch');
117117
grunt.registerTask('default', ['concat', 'uglify', 'jshint', 'jscs']);
118118
grunt.registerTask('lint', ['jshint', 'jscs']);

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "THREE.Terrain",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"main": "build/THREE.Terrain.min.js",
55
"ignore": [
66
"node_modules"

0 commit comments

Comments
 (0)