Updated dev dependencies; code style cleanup

IceCreamYou · Aug 22, 2015 · 4736bb7 · 4736bb7
1 parent e73016f
commit 4736bb7
Show file tree

Hide file tree

Showing 17 changed files with 499 additions and 407 deletions.
diff --git a/.jscs.json b/.jscs.json
@@ -1,19 +1,66 @@
 {
-    "requireCurlyBraces": ["for", "while", "do", "try", "catch"],
-    "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try"],
-    "disallowLeftStickedOperators": ["?", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
-    "disallowRightStickedOperators": ["?", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
-    "requireRightStickedOperators": ["!", "++", "--"],
-    "requireLeftStickedOperators": [",", "++", "--"],
+    "disallowEmptyBlocks": {
+        "allExcept": ["comments"]
+    },
     "disallowImplicitTypeConversion": [],
     "disallowKeywords": ["with"],
-    "disallowMultipleLineBreaks": true,
     "disallowKeywordsOnNewLine": [],
+    "disallowMixedSpacesAndTabs": true,
+    "disallowMultipleLineBreaks": true,
+    "disallowNewlineBeforeBlockStatements": true,
+    "disallowOperatorBeforeLineBreak": ["."],
+    "disallowSpaceAfterObjectKeys": true,
+    "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "~", "!"],
+    "disallowSpaceBeforeBinaryOperators": [","],
+    "disallowSpaceBeforeComma": true,
+    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+    "disallowSpaceBeforeSemicolon": true,
+    "disallowSpacesInCallExpression": true,
+    "disallowSpacesInFunctionDeclaration": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowSpacesInNamedFunctionExpression": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowSpacesInsideBrackets": {
+        "allExcept": ["[", "]", "{", "}"]
+    },
+    "disallowTrailingWhitespace": true,
+    "disallowYodaConditions": true,
+    "requireBlocksOnNewline": 1,
+    "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
+    "requireCapitalizedConstructors": true,
+    "requireCommaBeforeLineBreak": true,
+    "requireCurlyBraces": ["for", "while", "do", "try", "catch"],
     "requireKeywordsOnNewLine": ["else"],
+    "requireLineBreakAfterVariableAssignment": true,
     "requireLineFeedAtFileEnd": true,
     "requireParenthesesAroundIIFE": true,
-    "disallowSpaceAfterObjectKeys": true,
-    "requireCommaBeforeLineBreak": true,
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true
+    "requireSemicolons": true,
+    "requireSpaceAfterBinaryOperators": ["=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+    "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "case", "return", "try", "catch", "void", "with", "typeof"],
+    "requireSpaceAfterLineComment": {
+        "allExcept": ["#", "="]
+    },
+    "requireSpaceBeforeBinaryOperators": ["=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+    "requireSpaceBeforeBlockStatements": true,
+    "requireSpaceBeforeObjectValues": true,
+    "requireSpaceBetweenArguments": true,
+    "requireSpacesInConditionalExpression": {
+        "afterTest": true,
+        "beforeConsequent": true,
+        "afterConsequent": true,
+        "beforeAlternate": true
+    },
+    "requireSpacesInForStatement": true,
+    "requireSpacesInFunction": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "validateQuoteMarks": {
+        "escape": true,
+        "mark": "'"
+    }
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
     pkg: grunt.file.readJSON('package.json'),
     concat: {
       options: {
-        banner: banner + "\n",
+        banner: banner + '\n',
         separator: grunt.util.linefeed,
       },
       target: {
@@ -18,8 +18,8 @@ module.exports = function(grunt) {
           'src/core.js',
           'src/images.js',
           'src/filters.js',
-          //'src/gaussian.js',
-          //'src/weightedBoxBlurGaussian.js',
+          // 'src/gaussian.js',
+          // 'src/weightedBoxBlurGaussian.js',
           'src/generators.js',
           'src/materials.js',
           'src/scatter.js',
@@ -112,7 +112,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks("grunt-jscs-checker");
+  grunt.loadNpmTasks('grunt-jscs');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.registerTask('default', ['concat', 'uglify', 'jshint', 'jscs']);
   grunt.registerTask('lint', ['jshint', 'jscs']);

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "THREE.Terrain",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "build/THREE.Terrain.min.js",
   "ignore": [
     "node_modules"