Fix JSHint warnings

Fixes gh-36

Author: Stuk

.jshintignore

@@ -0,0 +1,3 @@
+**/spec/**
+**/node_modules/**
+**/packages/**

.jshintrc

@@ -0,0 +1,32 @@
+{
+    "bitwise": true,
+    "camelcase": true,
+    "curly": true,
+    "eqeqeq": true,
+    "forin": true,
+    "noarg": true,
+    "noempty": true,
+    "nonew": true,
+    "undef": true,
+    "unused": "paramsignore",
+    "trailing": true,
+    "indent": 4,
+    "boss": true,
+    "eqnull": true,
+    "browser": true,
+    "globals": {
+        "CustomEvent": true,
+        "WebSocket": false,
+
+        "require": false,
+        "exports": false,
+        "module": false,
+        "global": false,
+
+        "WeakMap": true,
+        "Map": true,
+        "Set": true,
+
+        "console": false
+    }
+}

bootstrap-node.js

@@ -5,7 +5,7 @@
     3-Clause BSD License
     https://github.com/motorola-mobility/montage/blob/master/LICENSE.md
 */
-
+/*jshint node:true */
 var Require = require("./require");
 require("./node"); // patches Require
 var URL = require("url");
@@ -36,8 +36,9 @@ var bootstrap = function () {
 };
 
 function findPackage(directory, callback) {
-    if (directory == PATH.dirname(directory))
+    if (directory === PATH.dirname(directory)) {
         return callback("Can't find package");
+    }
     var packageJson = PATH.join(directory, "package.json");
     FS.stat(packageJson, function (error, stat) {
         if (error || !stat.isFile()) {
@@ -82,7 +83,7 @@ var loadFreeModule = function (program, command, args) {
     .done();
 };
 
-if (require.main == module) {
+if (require.main === module) {
     bootstrap();
 }
 

bootstrap.js

@@ -30,6 +30,7 @@
             "promise": "packages/q/q.js"
         };
 
+        /*jshint -W089 */
         if (!global.preload) {
             for (var id in pending) {
                 load(pending[id]);
@@ -42,7 +43,7 @@
         global.bootstrap = function (id, factory) {
             definitions[id] = factory;
             delete pending[id];
-            for (var id in pending) {
+            for (id in pending) {
                 // this causes the function to exit if there are any remaining
                 // scripts loading, on the first iteration.  consider it
                 // equivalent to an array length check
@@ -53,6 +54,7 @@
             delete global.bootstrap;
             allModulesLoaded();
         };
+        /*jshint +W089 */
 
         // one module loaded for free, for use in require.js, browser.js
         global.bootstrap("mini-url", function (require, exports) {
@@ -108,14 +110,18 @@
                 if (mrLocation) {
                     if (script.dataset) {
                         for (name in script.dataset) {
-                            params[name] = script.dataset[name];
+                            if (script.dataset.hasOwnProperty(name)) {
+                                params[name] = script.dataset[name];
+                            }
                         }
                     } else if (script.attributes) {
                         var dataRe = /^data-(.*)$/,
                             letterAfterDash = /-([a-z])/g,
+                            /*jshint -W083 */
                             upperCaseChar = function (_, c) {
                                 return c.toUpperCase();
                             };
+                            /*jshint +W083 */
 
                         for (j = 0; j < script.attributes.length; j++) {
                             attr = script.attributes[j];
@@ -245,7 +251,7 @@
                     location: applicationLocation,
                     hash: params.applicationHash
                 })
-                .invoke('async', moduleId)
+                .invoke('async', moduleId);
             });
 
         })

browser.js

@@ -3,7 +3,8 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2012 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
-/*global bootstrap */
+/*global bootstrap,montageDefine:true */
+/*jshint -W015, evil:true, camelcase:false */
 bootstrap("require/browser", function (require) {
 
 var Require = require("require");
@@ -90,10 +91,12 @@ var __FILE__String = "__FILE__",
 
 Require.Compiler = function (config) {
     return function(module) {
-        if (module.factory || module.text === void 0)
+        if (module.factory || module.text === void 0) {
             return module;
-        if (config.useScriptInjection)
+        }
+        if (config.useScriptInjection) {
             throw new Error("Can't use eval.");
+        }
 
         // Here we use a couple tricks to make debugging better in various browsers:
         // TODO: determine if these are all necessary / the best options
@@ -118,7 +121,7 @@ Require.Compiler = function (config) {
         // module.factory = new Function("require", "exports", "module", module.text + "\n//*/"+sourceURLComment);
 
         module.factory.displayName = displayName;
-    }
+    };
 };
 
 Require.XhrLoader = function (config) {
@@ -177,12 +180,14 @@ Require.ScriptLoader = function (config) {
             return getDefinition(hash, module.id).promise;
         })
         .then(function (definition) {
+            /*jshint -W089 */
             delete definitions[hash][module.id];
             for (var name in definition) {
                 module[name] = definition[name];
             }
             module.location = location;
             module.directory = URL.resolve(location, ".");
+            /*jshint +W089 */
         });
     };
 };

node.js

@@ -5,7 +5,7 @@
     3-Clause BSD License
     https://github.com/motorola-mobility/montage/blob/master/LICENSE.md
 */
-
+/*jshint node:true */
 var Require = require("./require");
 var Promise = require("q");
 var FS = require("fs");
@@ -100,7 +100,7 @@ Require.NodeLoader = function NodeLoader(config) {
             type: "native",
             exports: require(id),
             location: location
-        }
+        };
     };
 };
 
@@ -124,8 +124,9 @@ Require.makeLoader = function makeLoader(config) {
 };
 
 Require.findPackagePath = function findPackagePath(directory) {
-    if (directory == PATH.dirname(directory))
+    if (directory === PATH.dirname(directory)) {
         return Promise.reject(new Error("Can't find package"));
+    }
     var packageJson = PATH.join(directory, "package.json");
     return Promise.ninvoke(FS, "stat", packageJson)
     .then(function (stat) {
@@ -151,7 +152,7 @@ Require.findPackageLocationAndModuleId = function findPackageLocationAndModuleId
         return {
             location: Require.directoryPathToLocation(packageDirectory),
             id: modulePath
-        }
+        };
     }, function (error) {
         throw new Error("Can't find package: " + path);
     });

package.json

@@ -12,7 +12,7 @@
   ],
   "main": "require",
   "scripts": {
-    "test": "node spec/phantom.js"
+    "test": "node spec/phantom.js && jshint ."
   },
   "bin": {
     "mr": "bin/mr"
@@ -31,7 +31,8 @@
     "wd": "~0.0.31",
     "joey": "~0.1.3",
     "istanbul": "~0.1.34",
-    "q-io": "~1.6.4"
+    "q-io": "~1.6.4",
+    "jshint": "~2.1.4"
   },
   "exclude": [
     "README.md",

require.js

@@ -44,8 +44,9 @@
 
 })(function (Require, Promise, URL) {
 
-    if (!this)
+    if (!this) {
         throw new Error("Require does not work in strict mode.");
+    }
 
     var globalEval = eval; // reassigning causes eval to not use lexical scope.
 
@@ -139,8 +140,9 @@
             // data-lock on a cycle of dependencies.
             loading = loading || {};
             // has this all happened before?  will it happen again?
-            if (has(loading, topId))
+            if (has(loading, topId)) {
                 return; // break the cycle of violence.
+            }
             loading[topId] = true; // this has happened before
             return load(topId, viaId)
             .then(function () {
@@ -234,20 +236,23 @@
         // too much performance evil for one function.
         function identify(id2, require2, seen) {
             var location = config.location;
-            if (require2.location === location)
+            if (require2.location === location) {
                 return id2;
+            }
 
             var internal = !!seen;
             seen = seen || {};
-            if (has(seen, location))
+            if (has(seen, location)) {
                 return null; // break the cycle of violence.
+            }
             seen[location] = true;
-
+            /*jshint -W089 */
             for (var name in config.mappings) {
                 var mapping = config.mappings[name];
                 location = mapping.location;
-                if (!config.hasPackage(location))
+                if (!config.hasPackage(location)) {
                     continue;
+                }
                 var candidate = config.getPackage(location);
                 var id1 = candidate.identify(id2, require2, seen);
                 if (id1 === null) {
@@ -265,6 +270,7 @@
                     "Can't identify " + id2 + " from " + require2.location
                 );
             }
+            /*jshint +W089 */
         }
 
         // Creates a unique require function for each module that encapsulates
@@ -387,7 +393,7 @@
                 try {
                     return JSON.parse(json);
                 } catch (error) {
-                    error.message = error.message + " in " + JSON.stringify(descriptionLocation)
+                    error.message = error.message + " in " + JSON.stringify(descriptionLocation);
                     throw error;
                 }
             });
@@ -409,8 +415,9 @@
 
         config.hasPackage = function (dependency) {
             dependency = normalizeDependency(dependency, config);
-            if (!dependency.location)
+            if (!dependency.location) {
                 return false;
+            }
             var location = dependency.location;
             return !!loadedPackages[location];
         };
@@ -494,8 +501,9 @@
                 dependency.name + "/"
             );
         }
-        if (!dependency.location)
+        if (!dependency.location) {
             return dependency; // partially completed
+        }
         // make sure the dependency location has a trailing slash so that
         // relative urls will resolve properly
         if (!/\/$/.test(dependency.location)) {
@@ -550,12 +558,14 @@
         var overlay = description.overlay || {};
         var layer;
         (config.overlays || Require.overlays).forEach(function (engine) {
+            /*jshint -W089 */
             if (overlay[engine]) {
                 var layer = overlay[engine];
                 for (var name in layer) {
                     description[name] = layer[name];
                 }
             }
+            /*jshint +W089 */
         });
         delete description.overlay;
 
@@ -611,8 +621,9 @@
         // dependencies, devDependencies if not in production
         [description.dependencies, !config.production ? description.devDependencies : null]
         .forEach(function (dependencies) {
-            if (!dependencies)
+            if (!dependencies) {
                 return;
+            }
             Object.keys(dependencies).forEach(function (name) {
                 if (!mappings[name]) {
                     // dependencies are equivalent to name and version mappings,
@@ -656,6 +667,7 @@
             source.unshift.apply(source, parts);
         }
         for (var i = 0, ii = source.length; i < ii; i++) {
+            /*jshint -W035 */
             var part = source[i];
             if (part === "" || part === ".") {
             } else if (part === "..") {
@@ -665,6 +677,7 @@
             } else {
                 target.push(part);
             }
+            /*jshint +W035 */
         }
         return target.join("/");
     }
@@ -804,10 +817,12 @@
                     id.indexOf(prefix) === 0 &&
                     id.charAt(prefix.length) === "/"
                 ) {
+                    /*jshint -W083 */
                     var mapping = mappings[prefix];
                     var rest = id.slice(prefix.length + 1);
                     return config.loadPackage(mapping, config)
                     .then(function (mappingRequire) {
+                        /*jshint +W083 */
                         module.mappingRedirect = rest;
                         module.mappingRequire = mappingRequire;
                         return mappingRequire.deepLoad(rest, config.location);