Merge branch 'master' into rendering-cleanup

Author: bitnenfer

.eslintrc.json

@@ -46,13 +46,13 @@
         "indent": [ "error", 4, { "SwitchCase": 1 } ],
         "key-spacing": [ "error", { "beforeColon": false, "afterColon": true }],
         "linebreak-style": [ "off" ],
-        "lines-around-comment": [ "error", { "beforeBlockComment": true, "allowBlockStart": true, "allowObjectStart": true, "allowArrayStart": true, "beforeLineComment": true, "allowBlockEnd": true }],
+        "lines-around-comment": [ "error", { "beforeBlockComment": true, "afterBlockComment": false, "beforeLineComment": true, "afterLineComment": false, "allowBlockStart": true, "allowBlockEnd": false, "allowObjectStart": true, "allowArrayStart": true, "allowBlockEnd": true }],
         "new-parens": "error",
         "no-array-constructor": "error",
         "no-lonely-if": "error",
         "no-mixed-spaces-and-tabs": "error",
         "no-plusplus": "off",
-        "no-trailing-spaces": [ "error", { "skipBlankLines": true } ],
+        "no-trailing-spaces": [ "error", { "skipBlankLines": true, "ignoreComments": true } ],
         "no-underscore-dangle": "off",
         "no-whitespace-before-property": "error",
         "object-curly-newline": [ "error", { "multiline": true, "minProperties": 0 } ],
@@ -65,7 +65,8 @@
         "space-before-function-paren": "error",
         "space-in-parens": [ "error",  "never" ],
         "space-infix-ops": [ "error", { "int32Hint": true } ],
-        "wrap-regex": "error"
+        "wrap-regex": "error",
+        "spaced-comment": [ "error", "always", { "block": { "balanced": true }} ]
 
     }
 }