Switched from JSHint to ESLint

.brackets.json

@@ -0,0 +1,23 @@
+{
+    "jslint.options": {
+        "vars": true,
+        "plusplus": true,
+        "node": true,
+        "browser": false,
+        "devel": true,
+        "nomen": true,
+        "indent": 4,
+        "maxerr": 50,
+        "regexp": true,
+        "es5": true
+    },
+    "defaultExtension": "js",
+    "language": {
+        "javascript": {
+            "linting.prefer": ["ESLint", "JSLint"],
+            "linting.usePreferredOnly": true
+        }
+    },
+    "spaceUnits": 4,
+    "useTabChar": false
+}

.eslintignore

@@ -0,0 +1,2 @@
+# Third party modules
+**/thirdparty/**

.eslintrc.json

@@ -0,0 +1,46 @@
+{
+    "env": {
+        "node": true
+    },
+    "rules": {
+        "no-bitwise": 2,
+        "curly": 2,
+        "eqeqeq": 2,
+        "guard-for-in": 2,
+        "wrap-iife": [2, "outside"],
+        "no-use-before-define": 2,
+        "new-cap": 2,
+        "no-caller": 2,
+        "no-empty": 2,
+        "no-new": 2,
+        "no-invalid-regexp": 2,
+        "no-control-regex": 2,
+        "no-regex-spaces": 2,
+        "no-undef": 2,
+        "strict": 2,
+        "no-unused-vars": [2, {"vars": "all", "args": "none"}],
+        "semi": 2,
+
+        "no-iterator": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-fallthrough": 2,
+        "no-proto": 2,
+        "no-script-url": 2,
+        "no-shadow": 0,
+        "no-shadow-restricted-names": 2,
+        "no-new-func": 2,
+        "no-new-wrappers": 2,
+        "no-new-require": 2,
+        "new-parens": 2,
+        "no-new-object": 2,
+        "no-invalid-this": 2,
+        "indent": [2, 4],
+
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+
+        "no-trailing-spaces": [2, { "skipBlankLines": true }],
+        "eol-last": 2
+    }
+}

Gruntfile.js

@@ -20,13 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-/*jslint regexp:true*/
-/*global module, require, process*/
-module.exports = function (grunt) {
+
 "use strict";
 
+module.exports = function (grunt) {
     var common  = require("./tasks/common")(grunt),
-        resolve = common.resolve,
         platform = common.platform(),
         staging;
 
@@ -205,10 +203,14 @@ module.exports = function (grunt) {
                 "dest"      : "deps/cef"
             }
         },
-        "jshint": {
-            "all"           : ["Gruntfile.js", "tasks/**/*.js"],
+        "eslint": {
+            "all"           : [
+                "Gruntfile.js",
+                "tasks/**/*.js",
+                "appshell/node-core/*.js"
+            ],
             "options": {
-                "jshintrc"  : ".jshintrc"
+                "quiet"     : true
             }
         },
         "build": {
@@ -238,7 +240,7 @@ module.exports = function (grunt) {
     });
 
     grunt.loadTasks("tasks");
-    grunt.loadNpmTasks("grunt-contrib-jshint");
+    grunt.loadNpmTasks("grunt-eslint");
     grunt.loadNpmTasks("grunt-contrib-copy");
     grunt.loadNpmTasks("grunt-contrib-clean");
     grunt.loadNpmTasks("grunt-curl");

appshell/appshell_extensions.js

@@ -27,9 +27,6 @@
 // Note: All file native file i/o functions are synchronous, but are exposed
 // here as asynchronous calls. 
 
-/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
-/*global define, native */
-
 var appshell;
 if (!appshell) {
     appshell = {};

appshell/node-core/BaseDomain.js

@@ -21,11 +21,6 @@
  *
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4,
-  maxerr: 50, node: true */
-/*global */
-
-(function () {
 "use strict";
 
 var Launcher = require("./Launcher"),
@@ -137,5 +132,3 @@
 }
 
 exports.init = init;
-
-}());

appshell/node-core/ConnectionManager.js

@@ -21,11 +21,6 @@
  *
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4,
-maxerr: 50, node: true */
-/*global */
-
-(function () {
 "use strict";
 
 var DomainManager = require("./DomainManager");
@@ -132,7 +127,9 @@ maxerr: 50, node: true */
     if (this._ws) {
         try {
             this._ws.close();
-            } catch (e) { }
+        } catch (e) {
+            // Do nothing
+        }
     }
     this._connected = false;
     _connections.splice(_connections.indexOf(this), 1);
@@ -226,7 +223,9 @@ maxerr: 50, node: true */
     for (i = 0; i < _connections.length; i++) {
         try {
             _connections[i].close();
-            } catch (err) { }
+        } catch (err) {
+            // Do nothing
+        }
     }
     _connections = [];
 }
@@ -247,4 +246,3 @@ maxerr: 50, node: true */
 exports.createConnection          = createConnection;
 exports.closeAllConnections       = closeAllConnections;
 exports.sendEventToAllConnections = sendEventToAllConnections;
-}());

appshell/node-core/DomainManager.js

@@ -21,15 +21,12 @@
  *
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4,
-maxerr: 50, node: true */
-/*global */
-
-(function () {
 "use strict";
 
+// TODO: verify if this has any side effects, and if not remove it.
+require("./Server");
+
 var util              = require("util"),
-        server            = require("./Server"),
     ConnectionManager = require("./ConnectionManager");
 
 /**
@@ -311,4 +308,3 @@ maxerr: 50, node: true */
 exports.emitEvent                  = emitEvent;
 exports.loadDomainModulesFromPaths = loadDomainModulesFromPaths;
 exports.getDomainDescriptions      = getDomainDescriptions;
-}());

appshell/node-core/Launcher.js

@@ -21,11 +21,6 @@
  *
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4,
-maxerr: 50, node: true */
-/*global */
-
-(function () {
 "use strict";
 
 var Logger = require("./Logger"),
@@ -135,5 +130,3 @@ maxerr: 50, node: true */
 
 exports.launch = launch;
 exports.exit   = exit;
-
-}());

appshell/node-core/Logger.js

@@ -21,11 +21,6 @@
  *
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4,
-maxerr: 50, node: true */
-/*global */
-
-(function () {
 "use strict";
 
 var fs           = require("fs"),
@@ -73,7 +68,9 @@ maxerr: 50, node: true */
 
             fs.appendFileSync(_logFilename,
                               timestampString + message + "\n");
-            } catch (e) { }
+        } catch (e) {
+            // Do nothing
+        }
     }
     _logHistory.push({
         level: level,
@@ -170,5 +167,3 @@ maxerr: 50, node: true */
 Logger.remapConsole   = remapConsole;
 Logger.getLogHistory  = getLogHistory;
 Logger.setLogFilename = setLogFilename;
-
-}());

appshell/node-core/Server.js

@@ -21,11 +21,6 @@
  *
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4,
-maxerr: 50, node: true */
-/*global */
-
-(function () {
 "use strict";
 
 /** @define{number} Number of ms to wait for the server to start */
@@ -34,8 +29,7 @@ maxerr: 50, node: true */
 /** @define{number} Number of ms between pings to parent process */
 var PING_DELAY = 1000; // send ping to parent process every 1 second
 
-    var fs                = require("fs"),
-        http              = require("http"),
+var http              = require("http"),
     WebSocket         = require("./thirdparty/ws"),
     EventEmitter      = require("events").EventEmitter,
     Logger            = require("./Logger"),
@@ -80,12 +74,16 @@ maxerr: 50, node: true */
     if (_wsServer) {
         try {
             _wsServer.close();
-            } catch (err1) { }
+        } catch (err1) {
+            // Do nothing
+        }
     }
     if (_httpServer) {
         try {
             _httpServer.close();
-            } catch (err2) { }
+        } catch (err2) {
+            // Do nothing
+        }
     }
     ConnectionManager.closeAllConnections();
     Logger.info("[Server] stopped");
@@ -272,5 +270,3 @@ maxerr: 50, node: true */
 // Public interface
 Server.start                    = start;
 Server.stop                     = stop;
-
-}());

package.json

@@ -14,7 +14,7 @@
     "devDependencies": {
         "grunt": "0.4.1",
         "grunt-cli": "0.1.6",
-        "grunt-contrib-jshint": "0.2.0",
+        "grunt-eslint": "18.1.0",
         "grunt-contrib-copy": "0.5.0",
         "grunt-contrib-clean": "0.4.0",
         "guid": "0.0.10",

tasks/.eslintrc.json

@@ -0,0 +1,7 @@
+{
+    "extends": "../.eslintrc.json",
+
+    "rules": {
+        "no-invalid-this": 0
+    }
+}