More for OpenUserJS#262

* Change/Add some more comments in for Ambiguous
* Remove some comments added as it appears they have been identified.
* Unified what comments I found that I added for 264.

Applies to OpenUserJS#264 as well

Author: Martii

controllers/admin.js

@@ -56,7 +56,7 @@ exports.userAdmin = function (aReq, aRes, aNext) {
   if (!userIsAdmin(aReq)) { return aNext(); }
 
   // You can only see users with a role less than yours
-  User.find({ role: { $gt: thisUser.role } }, function (aErr, aUsers) { // TODO: STYLEGUIDE conformance needed here with $
+  User.find({ role: { $gt: thisUser.role } }, function (aErr, aUsers) { // TODO: STYLEGUIDE.md conformance needed here
     var i = 0;
     options.users = [];
 

controllers/group.js

@@ -116,7 +116,7 @@ exports.addScriptToGroups = function (aScript, aGroupNames, aCallback) {
 
       // Update the group ratings in the background
       aGroups.forEach(function (aGroup) {
-        Script.find({ _id: { $in: aGroup._scriptIds } }, // TODO: STYLEGUIDE conformance needed here
+        Script.find({ _id: { $in: aGroup._scriptIds } }, // TODO: STYLEGUIDE.md conformance needed here
           function (aErr, aScripts) {
             if (aErr || aScripts.length < 2) { return; }
 

controllers/index.js

@@ -173,12 +173,12 @@ function getSearchResults(aReq, aRes, aPrefixSearch, aFullSearch, aOpts, aCallba
     condition[aProp] = fullRegex;
     conditions.push(condition);
   });
-  aOpts['$or'] = conditions; // TODO: STYLEGUIDE.md conformance needed here
+  aOpts['$or'] = conditions;
 
   var options = {
     'username': user ? user.name : null,
     'search': search,
-    'scriptsList': scriptsList              // TODO: Where did this identifier come from?? Possibly a global
+    'scriptsList': scriptsList              // TODO: Ambiguous - Where did this identifier come from?? Possibly a global
   };
 
   // Page metadata
@@ -206,7 +206,7 @@ exports.toolbox = function (aReq, aRes) {
   var options = {
     toolbox: true,
     username: user ? user.name : null,
-    scriptsList: scriptsList              // TODO: Where did this identifier come from?? Possibly a global
+    scriptsList: scriptsList              // TODO: Ambiguous - Where did this identifier come from?? Possibly a global
   };
 
   // Page metadata

controllers/issue.js

@@ -175,7 +175,7 @@ exports.view = function (aReq, aRes, aNext) {
       //--- Tasks
 
       // Show the number of open issues
-      var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: { $ne: false } }); // STYLEGUIDE.md conformance needed here
+      var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: { $ne: false } }); // TODO: STYLEGUIDE.md conformance needed here
       tasks.push(countTask(scriptOpenIssueCountQuery, options, 'issueCount'));
 
       // Pagination

controllers/user.js

@@ -685,7 +685,7 @@ exports.edit = function (aReq, aRes, aNext) {
     options.defaultStrategy = strategies[defaultStrategy].name;
     options.haveOtherStrategies = options.usedStrategies.length > 0;
 
-    scriptsList.listScripts({ _authorId: user._id, isLib: null, flagged: null }, // TODO: Another possible global
+    scriptsList.listScripts({ _authorId: user._id, isLib: null, flagged: null }, // TODO: Global detected
       { size: -1 }, '/user/edit',
       function (aScriptsList) {
         aScriptsList.edit = true;
@@ -1119,7 +1119,7 @@ exports.userManageGitHubPage = function (aReq, aRes, aNext) {
               aUserData.save(aCallback);
             },
             function (aCallback) {
-              console.log(util.format('Updated User(%s).ghUsername', aUserData.name)); // WATCHPOINT
+              console.log(util.format('Updated User(%s).ghUsername', aUserData.name));
               aCallback(null);
             },
           ], aCallback);
@@ -1222,7 +1222,7 @@ exports.uploadScript = function (aReq, aRes, aNext) {
     }
 
     stream = fs.createReadStream(script.path);
-    stream.on('data', function (aD) { bufs.push(aD); }); // TODO: Non-script function parm name
+    stream.on('data', function (aD) { bufs.push(aD); }); // TODO: Non-descript function parm
 
     stream.on('end', function () {
       User.findOne({ _id: user._id }, function (aErr, aUser) {
@@ -1374,7 +1374,7 @@ function getExistingScript(aReq, aOptions, aAuthedUser, aCallback) {
         }
       }
 
-      aStream.on('data', function (aD) { bufs.push(aD); }); // TODO: Small function parm
+      aStream.on('data', function (aD) { bufs.push(aD); }); // TODO: Non-descript function parm
       aStream.on('end', function () {
         // Page metadata
         pageMetadata(aOptions, 'Edit ' + aScript.name);

libs/flag.js

@@ -80,9 +80,9 @@ function getThreshold(aModel, aContent, aAuthor, aCallback) {
 }
 exports.getThreshold = getThreshold;
 
-function saveContent(aModel, aContent, aAuthor, flags, aCallback) { // TODO: Ambiguous
+function saveContent(aModel, aContent, aAuthor, aFlags, aCallback) {
   if (!aContent.flags) { aContent.flags = 0; }
-  aContent.flags += flags;
+  aContent.flags += aFlags;
 
   if (aContent.flags >= thresholds[aModel.modelName] * (aAuthor.role < 4 ? 2 : 1)) {
     return getThreshold(aModel, aContent, aAuthor, function (aThreshold) {

libs/modifySessions.js

@@ -30,7 +30,7 @@ exports.add = function (aReq, aUser, aCallback) {
   var store = aReq.sessionStore;
 
   function finish(aErr, aUser) {
-    aReq.session.user = serializeUser(aUser); // TODO: Ambiguous
+    aReq.session.user = serializeUser(aUser);
     aCallback();
   }
 
@@ -44,7 +44,7 @@ exports.add = function (aReq, aUser, aCallback) {
         aSessionIds.push(aReq.sessionID);
       }
 
-      aUser.sessionIds = aSessionIds; // TODO: Ambiguous
+      aUser.sessionIds = aSessionIds;
       aUser.save(finish);
     });
   } else {