Merge pull request #458 from jerone/jshint

Some JSHint fixes +1 merge
OpenUserJS · Dec 2, 2014 · 8fdba9a · 8fdba9a
2 parents 88fd8be + 59a68a0
commit 8fdba9a
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 59 deletions.
diff --git a/app.js b/app.js
@@ -26,7 +26,6 @@ var passport = require('passport');
 
 var app = express();
 
-var statusCodePage = require('./libs/templateHelpers').statusCodePage;
 var modifySessions = require('./libs/modifySessions');
 
 var settings = require('./models/settings.json');

diff --git a/controllers/admin.js b/controllers/admin.js
@@ -24,7 +24,6 @@ var userRoles = require('../models/userRoles.json');
 var strategies = require('./strategies.json');
 var loadPassport = require('../libs/passportLoader').loadPassport;
 var strategyInstances = require('../libs/passportLoader').strategyInstances;
-var scriptStorage = require('./scriptStorage');
 var modelParser = require('../libs/modelParser');
 var helpers = require('../libs/helpers');
 var statusCodePage = require('../libs/templateHelpers').statusCodePage;
@@ -66,7 +65,6 @@ exports.userAdmin = function (aReq, aRes, aNext) {
 
   // You can only see users with a role less than yours
   User.find({ role: { $gt: authedUser.role } }, function (aErr, aUsers) {
-    var i = 0;
     options.users = [];
 
     aUsers.forEach(function (aUser) {
@@ -168,7 +166,6 @@ exports.adminUserUpdate = function (aReq, aRes, aNext) {
 
     //
     var options = {};
-    var tasks = [];
 
     // Session
     authedUser = options.authedUser = modelParser.parseUser(authedUser);
@@ -428,7 +425,6 @@ exports.authAsUser = function (aReq, aRes, aNext) {
 
   //
   var options = {};
-  var tasks = [];
 
   // Session
   authedUser = options.authedUser = modelParser.parseUser(authedUser);

diff --git a/controllers/auth.js b/controllers/auth.js
@@ -12,7 +12,6 @@ var loadPassport = require('../libs/passportLoader').loadPassport;
 var strategyInstances = require('../libs/passportLoader').strategyInstances;
 var Strategy = require('../models/strategy.js').Strategy;
 var User = require('../models/user').User;
-var userRoles = require('../models/userRoles.json');
 var verifyPassport = require('../libs/passportVerify').verify;
 var cleanFilename = require('../libs/helpers').cleanFilename;
 var addSession = require('../libs/modifySessions').add;
@@ -122,7 +121,7 @@ exports.callback = function (aReq, aRes, aNext) {
   if (openIdStrategies[strategy]) {
     strategyInstance._verify = function (aId, aDone) {
       verifyPassport(aId, strategy, username, aReq.session.user, aDone);
-    }
+    };
   } else {
     strategyInstance._verify =
       function (aToken, aRefreshOrSecretToken, aProfile, aDone) {

diff --git a/controllers/discussion.js b/controllers/discussion.js
@@ -446,7 +446,6 @@ exports.createComment = function (aReq, aRes, aNext) {
   var topic = aReq.params.topic;
   var authedUser = aReq.session.user;
   var content = aReq.body['comment-content'];
-  var commentId = aReq.body['comment-id']; // for editing
 
   if (!authedUser) { return aNext(); }
 

diff --git a/controllers/group.js b/controllers/group.js
@@ -209,7 +209,6 @@ exports.list = function (aReq, aRes) {
 
 var setupGroupSidePanel = function (aOptions) {
   // Shortcuts
-  var group = aOptions.group;
   var authedUser = aOptions.authedUser;
 
   // Mod

diff --git a/controllers/index.js b/controllers/index.js
@@ -145,7 +145,7 @@ exports.home = function (aReq, aRes) {
         pageMetadata(options, ['Flagged Scripts', 'Moderation']);
       }
     }
-  };
+  }
   function render() { aRes.render('pages/scriptListPage', options); }
   function asyncComplete() { preRender(); render(); }
   async.parallel(tasks, asyncComplete);
@@ -217,7 +217,7 @@ exports.register = function (aReq, aRes) {
     var githubStrategy = _.findWhere(options.strategies, { strat: 'github' });
     if (githubStrategy)
       githubStrategy.selected = true;
-  };
+  }
   function render() { aRes.render('pages/loginPage', options); }
   function asyncComplete() { preRender(); render(); }
   async.parallel(tasks, asyncComplete);

diff --git a/controllers/issue.js b/controllers/issue.js
@@ -253,7 +253,7 @@ exports.open = function (aReq, aRes, aNext) {
     function preRender() {
       // Page metadata
       pageMetadata(options, ['New Issue', script.name]);
-    };
+    }
     function render() { aRes.render('pages/scriptNewIssuePage', options); }
     function asyncComplete() { preRender(); render(); }
 

diff --git a/controllers/moderation.js b/controllers/moderation.js
@@ -25,7 +25,6 @@ exports.removedItemPage = function (aReq, aRes, aNext) {
 
   //
   var options = {};
-  var tasks = [];
 
   // Session
   authedUser = options.authedUser = modelParser.parseUser(authedUser);

diff --git a/controllers/script.js b/controllers/script.js
@@ -6,8 +6,6 @@ var isDev = require('../libs/debug').isDev;
 var isDbg = require('../libs/debug').isDbg;
 
 //
-var fs = require('fs');
-var formidable = require('formidable');
 var async = require('async');
 var _ = require('underscore');
 var sanitizeHtml = require('sanitize-html');
@@ -266,7 +264,6 @@ var getScriptPageTasks = function (aOptions) {
 
 var setupScriptSidePanel = function (aOptions) {
   // Shortcuts
-  var script = aOptions.script;
   var authedUser = aOptions.authedUser;
 
   // User
@@ -292,8 +289,6 @@ exports.view = function (aReq, aRes, aNext) {
   var authedUser = aReq.session.user;
 
   var installNameSlug = scriptStorage.getInstallName(aReq);
-  var scriptAuthor = aReq.params.username;
-  var scriptNameSlug = aReq.params.scriptname;
   var isLib = aReq.params.isLib;
 
   Script.findOne({
@@ -355,8 +350,6 @@ exports.edit = function (aReq, aRes, aNext) {
   aReq.params.username = authedUser.name.toLowerCase();
 
   var installNameSlug = scriptStorage.getInstallName(aReq);
-  var scriptAuthor = aReq.params.username;
-  var scriptNameSlug = aReq.params.scriptname;
   var isLib = aReq.params.isLib;
 
   Script.findOne({
@@ -398,8 +391,6 @@ exports.edit = function (aReq, aRes, aNext) {
     options.searchBarPlaceholder = modelQuery.scriptListQueryDefaults.searchBarPlaceholder;
     options.searchBarFormAction = modelQuery.scriptListQueryDefaults.searchBarFormAction;
 
-    var baseUrl = script && script.isLib ? '/libs/' : '/scripts/';
-
     if (aReq.body.remove) {
       // POST
       scriptStorage.deleteScript(aScriptData.installName, function () {

diff --git a/controllers/scriptStorage.js b/controllers/scriptStorage.js
@@ -61,7 +61,6 @@ exports.getSource = function (aReq, aCallback) {
 
 exports.sendScript = function (aReq, aRes, aNext) {
   var accept = aReq.headers.accept;
-  var installName = null;
 
   if (0 !== aReq.url.indexOf('/libs/') && accept === 'text/x-userscript-meta') {
     return exports.sendMeta(aReq, aRes, aNext);
@@ -234,7 +233,6 @@ exports.getMeta = function (aChunks, aCallback) {
   // get the user script header.
   var str = '';
   var i = 0;
-  var len = aChunks.length;
   var header = null;
 
   for (; i < aChunks.length; ++i) {

diff --git a/controllers/user.js b/controllers/user.js
@@ -13,7 +13,6 @@ var _ = require('underscore');
 var util = require('util');
 
 var Comment = require('../models/comment').Comment;
-var Flag = require('../models/flag').Flag;
 var Script = require('../models/script').Script;
 var Strategy = require('../models/strategy').Strategy;
 var User = require('../models/user').User;
@@ -97,7 +96,6 @@ var getUserPageTasks = function (aOptions) {
 
   // Shortcuts
   var user = aOptions.user;
-  var authedUser = aOptions.authedUser;
 
   //--- Tasks
 
@@ -218,7 +216,7 @@ exports.userListPage = function (aReq, aRes, aNext) {
     }
   }
   function render() { aRes.render('pages/userListPage', options); }
-  function asyncComplete(err) { if (err) { return aNext(); } else { preRender(); render(); } };
+  function asyncComplete(err) { if (err) { return aNext(); } else { preRender(); render(); } }
   async.parallel(tasks, asyncComplete);
 };
 
@@ -263,9 +261,6 @@ exports.view = function (aReq, aRes, aNext) {
     // scriptListQuery: Defaults
     modelQuery.applyScriptListQueryDefaults(scriptListQuery, options, aReq);
 
-    // scriptListQuery: Pagination
-    var pagination = options.pagination; // is set in modelQuery.apply___ListQueryDefaults
-
     //--- Tasks
 
     // UserPage tasks
@@ -461,8 +456,6 @@ exports.userScriptListPage = function (aReq, aRes, aNext) {
 exports.userEditProfilePage = function (aReq, aRes, aNext) {
   var authedUser = aReq.session.user;
 
-  var username = aReq.params.username;
-
   User.findOne({
     _id: authedUser._id
   }, function (aErr, aUserData) {
@@ -858,7 +851,6 @@ exports.userGitHubImportScriptPage = function (aReq, aRes, aNext) {
 
   //
   var options = {};
-  var tasks = [];
 
   // Session
   authedUser = options.authedUser = modelParser.parseUser(authedUser);
@@ -1001,7 +993,7 @@ exports.userGitHubRepoPage = function (aReq, aRes, aNext) {
         options.repo = aRepo;
         options.repoAsEncoded = {
           default_branch: encodeURI(options.repo.default_branch)
-        }
+        };
 
         github.gitdata.getJavascriptBlobs({
           user: encodeURIComponent(aRepo.owner.login),
@@ -1025,7 +1017,7 @@ exports.userGitHubRepoPage = function (aReq, aRes, aNext) {
 
         aCallback(null);
       },
-    ], aCallback)
+    ], aCallback);
   });
 
   //---
@@ -1092,7 +1084,6 @@ exports.userManageGitHubPage = function (aReq, aRes, aNext) {
   pageMetadata(options, ['Manage', 'GitHub']);
 
   //
-  var TOO_MANY_SCRIPTS = 'GitHub user has too many scripts to batch import.';
   tasks.push(function (aCallback) {
     var githubUserName = aReq.query.user || authedUser.ghUsername;
 
@@ -1111,7 +1102,7 @@ exports.userManageGitHubPage = function (aReq, aRes, aNext) {
             },
             function (aGithubUser, aCallback) {
               options.githubUser = aGithubUser;
-              console.log(githubUser);
+              console.log(aGithubUser);
               User.findOne({
                 _id: authedUser._id
               }, aCallback);
@@ -1148,7 +1139,7 @@ exports.userManageGitHubPage = function (aReq, aRes, aNext) {
         console.log(aReq.body);
         _.each(aReq.body, function (aRepo, aReponame) {
           // Load all scripts in the repo
-          if (typeof aRepo === 'string' && reponame.substr(-4) === '_all') {
+          if (typeof aRepo === 'string' && aReponame.substr(-4) === '_all') {
             aReponame = aRepo;
             aRepo = aRepos[aReponame];
 

diff --git a/libs/collectiveRating.js b/libs/collectiveRating.js
@@ -46,7 +46,6 @@ exports.getRating = getRating;
 // expiring cache (either memory or DB based) to
 // speed up voting and flagging
 exports.getKarma = function (aUser, aMaxKarma, aCallback) {
-  var ratings = [];
   var karma = 0;
   Script.find({ _authorId: aUser._id }, 'rating', function (aErr, aScripts) {
     if (aErr) { return aCallback(karma); }

diff --git a/libs/githubClient.js b/libs/githubClient.js
@@ -47,7 +47,7 @@ var githubGitDataGetBlobAsUtf8 = function (aMsg, aCallback) {
     },
     function (aBlob, aCallback) {
       var content = aBlob.content;
-      if (aBlob.encoding == 'base64') {
+      if (aBlob.encoding === 'base64') {
         var buf = new Buffer(content, 'base64');
         content = buf.toString('utf8');
       }
@@ -69,7 +69,7 @@ var githubUserContentGetBlobAsUtf8 = function (aMsg, aCallback) {
       request.get(url, aCallback);
     },
     function (aResponse, aBody, aCallback) {
-      if (aResponse.statusCode != 200)
+      if (aResponse.statusCode !== 200)
         return aCallback(util.format('Status Code %s', aResponse.statusCode));
 
       aCallback(null, aBody);

diff --git a/libs/modelParser.js b/libs/modelParser.js
@@ -16,7 +16,6 @@ var Script = require('../models/script').Script;
 
 var userRoles = require('../models/userRoles.json');
 var renderMd = require('../libs/markdown').renderMd;
-var helpers = require('../libs/helpers');
 var getRating = require('../libs/collectiveRating').getRating;
 var cleanFilename = require('../libs/helpers').cleanFilename;
 
@@ -396,7 +395,7 @@ var canUserPostTopicToCategory = function (aUser, aCategory) {
     return false; // Not logged in.
 
   // Check if this category requires a minimum role to post topics.
-  console.log(aCategory.roleReqToPostTopic, _.isNumber(aCategory.roleReqToPostTopic), aUser.role, aUser.role <= aCategory.roleReqToPostTopic)
+  console.log(aCategory.roleReqToPostTopic, _.isNumber(aCategory.roleReqToPostTopic), aUser.role, aUser.role <= aCategory.roleReqToPostTopic);
   if (_.isNumber(aCategory.roleReqToPostTopic)) {
     return aUser.role <= aCategory.roleReqToPostTopic;
   } else {

diff --git a/libs/modifySessions.js b/libs/modifySessions.js
@@ -104,7 +104,7 @@ exports.destroy = function (aReq, aUser, aCallback) {
     }
   };
 
-  if (!aUser || !aUser.sessionIds) { return aCb('No sessions', null); }
+  if (!aUser || !aUser.sessionIds) { return aCallback('No sessions', null); }
 
   async.each(aUser.sessionIds, function (aId, aCb) {
     store.set(aId, emptySess, aCb);

diff --git a/libs/passportVerify.js b/libs/passportVerify.js
@@ -75,4 +75,4 @@ exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
       }
     }
   );
-}
+};
diff --git a/libs/remove.js b/libs/remove.js
@@ -50,7 +50,7 @@ function removeable(aModel, aContent, aUser, aCallback) {
 exports.removeable = removeable;
 
 function remove(aModel, aContent, aUser, aReason, aCallback) {
-  var remove = new Remove({
+  var removeModel = new Remove({
     'model': aModel.modelName,
     'content': aContent.toObject(),
     'removed': new Date(),
@@ -60,7 +60,7 @@ function remove(aModel, aContent, aUser, aReason, aCallback) {
     '_removerId': aUser._id
   });
 
-  remove.save(function (aErr, aRemove) {
+  removeModel.save(function (aErr, aRemove) {
     aContent.remove(function (aErr) { aCallback(aRemove); });
   });
 }
@@ -112,7 +112,7 @@ exports.findDeadorAlive = function (aModel, aQuery, aUser, aCallback) {
     var rmQuery = { model: modelName };
 
     if (!aErr && aContent) { return aCallback(true, aContent, null); }
-    if (modelName != 'User' && -1 === modelNames.indexOf(modelName)) {
+    if (modelName !== 'User' && -1 === modelNames.indexOf(modelName)) {
       return aCallback(null, null, null);
     }
 
@@ -126,7 +126,7 @@ exports.findDeadorAlive = function (aModel, aQuery, aUser, aCallback) {
         return aCallback(false, null, aRemoved);
       }
 
-      aCallback(false, new model(aRemoved.content), aRemoved); // TODO: Ambiguous
+      aCallback(false, new aModel(aRemoved.content), aRemoved);
     });
   });
 };
diff --git a/libs/repoManager.js b/libs/repoManager.js
@@ -8,11 +8,9 @@ var isDbg = require('../libs/debug').isDbg;
 //
 var https = require('https');
 var async = require('async');
-var util = require('util');
 var _ = require('underscore');
 
 var Strategy = require('../models/strategy').Strategy;
-var User = require('../models/user').User;
 
 var nil = require('./helpers').nil;
 var github = require('../libs/githubClient');
@@ -38,7 +36,7 @@ function fetchRaw(aHost, aPath, aCallback) {
   var req = https.request(options,
     function (aRes) {
       var bufs = [];
-      if (aRes.statusCode != 200) { console.log(aRes.statusCode); return aCallback([new Buffer('')]); }
+      if (aRes.statusCode !== 200) { console.log(aRes.statusCode); return aCallback([new Buffer('')]); }
       else {
         aRes.on('data', function (aD) { bufs.push(aD); }); // TODO: Non-descript function parm
         aRes.on('end', function () {
@@ -102,7 +100,6 @@ RepoManager.prototype.loadScripts = function (aCallback, aUpdate) {
   var scriptStorage = require('../controllers/scriptStorage');
   var arrayOfRepos = this.makeRepoArray();
   var that = this;
-  var scripts = [];
 
   // TODO: remove usage of makeRepoArray since it causes redundant looping
   arrayOfRepos.forEach(function (aRepo) {
@@ -161,7 +158,6 @@ Repo.prototype.fetchUserScripts = function (aCallback) {
 // Looks for user script in the current directory
 // and initiates searches on subdirectories
 Repo.prototype.parseTree = function (aTree, aPath, aDone) {
-  var object;
   var trees = [];
   var that = this;
   var repos = this.manager.repos;
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         }
       );
-    }
+    };