ESlint keyword-spacing, no-multi-spaces

This commit is contained in:
Peter Jaszkowiak
2017-02-18 01:52:56 -07:00
parent a5a3f3089a
commit 604358ecc4
116 changed files with 210 additions and 210 deletions

View File

@@ -86,7 +86,7 @@ Analytics.writeData = function (callback) {
}
if (Object.keys(counters).length > 0) {
for(var key in counters) {
for (var key in counters) {
if (counters.hasOwnProperty(key)) {
dbQueue.push(async.apply(db.sortedSetIncrBy, 'analytics:' + key, counters[key], today.getTime()));
delete counters[key];

View File

@@ -28,7 +28,7 @@ groupsController.list = function (req, res, next) {
pageCount = Math.ceil(groupNames.length / groupsPerPage);
var start = (page - 1) * groupsPerPage;
var stop = start + groupsPerPage - 1;
var stop = start + groupsPerPage - 1;
groupNames = groupNames.slice(start, stop + 1);
groups.getGroupsData(groupNames, next);

View File

@@ -79,7 +79,7 @@ function getNodeInfo(callback) {
}
function getGitInfo(callback) {
function get(cmd, callback) {
function get(cmd, callback) {
exec(cmd, function (err, stdout) {
if (err) {
winston.error(err);

View File

@@ -29,7 +29,7 @@ uploadsController.uploadCategoryPicture = function (req, res, next) {
}
if (validateUpload(req, res, next, uploadedFile, allowedImageTypes)) {
var filename = 'category-' + params.cid + path.extname(uploadedFile.name);
var filename = 'category-' + params.cid + path.extname(uploadedFile.name);
uploadImage(filename, 'category', uploadedFile, req, res, next);
}
};

View File

@@ -8,7 +8,7 @@ var validator = require('validator');
var user = require('../user');
var topics = require('../topics');
var pagination = require('../pagination');
var helpers = require('./helpers');
var helpers = require('./helpers');
var tagsController = {};

View File

@@ -149,7 +149,7 @@ topicsController.get = function (req, res, callback) {
},
function (topicData, next) {
function findPost(index) {
for(var i = 0; i < topicData.posts.length; i += 1) {
for (var i = 0; i < topicData.posts.length; i += 1) {
if (parseInt(topicData.posts[i].index, 10) === parseInt(index, 10)) {
return topicData.posts[i];
}

View File

@@ -78,7 +78,7 @@ module.exports = function (db, module) {
_id: 0,
};
for(var i = 0; i < fields.length; i += 1) {
for (var i = 0; i < fields.length; i += 1) {
fields[i] = helpers.fieldToString(fields[i]);
_fields[fields[i]] = 1;
}
@@ -88,7 +88,7 @@ module.exports = function (db, module) {
}
item = item || {};
var result = {};
for(i = 0; i < fields.length; i += 1) {
for (i = 0; i < fields.length; i += 1) {
result[fields[i]] = item[fields[i]] !== undefined ? item[fields[i]] : null;
}
callback(null, result);
@@ -104,7 +104,7 @@ module.exports = function (db, module) {
_key: 1,
};
for(var i = 0; i < fields.length; i += 1) {
for (var i = 0; i < fields.length; i += 1) {
fields[i] = helpers.fieldToString(fields[i]);
_fields[fields[i]] = 1;
}
@@ -145,12 +145,12 @@ module.exports = function (db, module) {
module.getObjectValues = function (key, callback) {
module.getObject(key, function (err, data) {
if(err) {
if (err) {
return callback(err);
}
var values = [];
for(var key in data) {
for (var key in data) {
if (data && data.hasOwnProperty(key)) {
values.push(data[key]);
}

View File

@@ -12,11 +12,11 @@ helpers.toMap = function (data) {
};
helpers.fieldToString = function (field) {
if(field === null || field === undefined) {
if (field === null || field === undefined) {
return field;
}
if(typeof field !== 'string') {
if (typeof field !== 'string') {
field = field.toString();
}
// if there is a '.' in the field name it inserts subdocument in mongo, replace '.'s with \uff0E
@@ -25,7 +25,7 @@ helpers.fieldToString = function (field) {
};
helpers.valueToString = function (value) {
if(value === null || value === undefined) {
if (value === null || value === undefined) {
return value;
}

View File

@@ -55,7 +55,7 @@ module.exports = function (db, module) {
};
module.listRemoveAll = function (key, value, callback) {
callback = callback || helpers.noop;
callback = callback || helpers.noop;
if (!key) {
return callback();
}
@@ -88,7 +88,7 @@ module.exports = function (db, module) {
}
db.collection('objects').findOne({_key: key}, { array: 1}, function (err, data) {
if(err || !(data && data.array)) {
if (err || !(data && data.array)) {
return callback(err, []);
}

View File

@@ -5,7 +5,7 @@ module.exports = function (db, module) {
module.setAdd = function (key, value, callback) {
callback = callback || helpers.noop;
if(!Array.isArray(value)) {
if (!Array.isArray(value)) {
value = [value];
}
@@ -36,7 +36,7 @@ module.exports = function (db, module) {
return callback();
}
if(!Array.isArray(value)) {
if (!Array.isArray(value)) {
value = [value];
}
@@ -46,7 +46,7 @@ module.exports = function (db, module) {
var bulk = db.collection('objects').initializeUnorderedBulkOp();
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
bulk.find({_key: keys[i]}).upsert().updateOne({ $addToSet: {
members: {
$each: value,
@@ -61,7 +61,7 @@ module.exports = function (db, module) {
module.setRemove = function (key, value, callback) {
callback = callback || helpers.noop;
if(!Array.isArray(value)) {
if (!Array.isArray(value)) {
value = [value];
}
@@ -83,7 +83,7 @@ module.exports = function (db, module) {
var bulk = db.collection('objects').initializeUnorderedBulkOp();
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
bulk.find({_key: keys[i]}).updateOne({$pull: {
members: value,
}});
@@ -174,7 +174,7 @@ module.exports = function (db, module) {
});
var returnData = new Array(keys.length);
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
returnData[i] = sets[keys[i]] || [];
}
callback(null, returnData);
@@ -206,7 +206,7 @@ module.exports = function (db, module) {
module.setRemoveRandom = function (key, callback) {
callback = callback || function () {};
db.collection('objects').findOne({_key: key}, function (err, data) {
if(err || !data) {
if (err || !data) {
return callback(err);
}

View File

@@ -198,7 +198,7 @@ module.exports = function (db, module) {
}
value = helpers.valueToString(value);
method(key, 0, -1, function (err, result) {
if(err) {
if (err) {
return callback(err);
}
@@ -263,7 +263,7 @@ module.exports = function (db, module) {
var returnData = [];
var item;
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
item = map[keys[i]];
returnData.push(item ? item.score : null);
}
@@ -290,7 +290,7 @@ module.exports = function (db, module) {
var returnData = new Array(values.length);
var score;
for(var i = 0; i < values.length; i += 1) {
for (var i = 0; i < values.length; i += 1) {
score = map[values[i]];
returnData[i] = utils.isNumber(score) ? score : null;
}
@@ -367,7 +367,7 @@ module.exports = function (db, module) {
});
var returnData = new Array(keys.length);
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
returnData[i] = sets[keys[i]] || [];
}
callback(null, returnData);

View File

@@ -35,7 +35,7 @@ module.exports = function (db, module) {
var bulk = db.collection('objects').initializeUnorderedBulkOp();
for(var i = 0; i < scores.length; i += 1) {
for (var i = 0; i < scores.length; i += 1) {
bulk.find({_key: key, value: values[i]}).upsert().updateOne({$set: {score: parseFloat(scores[i])}});
}
@@ -53,7 +53,7 @@ module.exports = function (db, module) {
var bulk = db.collection('objects').initializeUnorderedBulkOp();
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
bulk.find({_key: keys[i], value: value}).upsert().updateOne({$set: {score: parseFloat(score)}});
}

View File

@@ -11,7 +11,7 @@ module.exports = function (db, module) {
{ $match: { _key: {$in: keys}} },
{ $group: { _id: {value: '$value'}, count: {$sum: 1}} },
{ $match: { count: keys.length} },
{ $group: { _id: null, count: { $sum: 1 } } },
{ $group: { _id: null, count: { $sum: 1 } } },
];
db.collection('objects').aggregate(pipeline, function (err, data) {

View File

@@ -10,7 +10,7 @@ module.exports = function (db, module) {
var pipeline = [
{ $match: { _key: {$in: keys} } },
{ $group: { _id: {value: '$value' } } },
{ $group: { _id: null, count: { $sum: 1 } } },
{ $group: { _id: null, count: { $sum: 1 } } },
];
var project = { _id: 0, count: '$count' };

View File

@@ -52,7 +52,7 @@ module.exports = function (redisClient, module) {
}
var multi = redisClient.multi();
for(var x = 0; x < keys.length; x += 1) {
for (var x = 0; x < keys.length; x += 1) {
multi.hmget.apply(multi, [keys[x]].concat(fields));
}

View File

@@ -30,7 +30,7 @@ module.exports = function (redisClient, module) {
module.deleteAll = function (keys, callback) {
callback = callback || function () {};
var multi = redisClient.multi();
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
multi.del(keys[i]);
}
multi.exec(function (err, res) {

View File

@@ -45,7 +45,7 @@ module.exports = function (redisClient, module) {
return callback(null, data);
}
var objects = [];
for(var i = 0; i < data.length; i += 2) {
for (var i = 0; i < data.length; i += 2) {
objects.push({value: data[i], score: parseFloat(data[i + 1])});
}
callback(null, objects);
@@ -74,7 +74,7 @@ module.exports = function (redisClient, module) {
return callback(err);
}
var objects = [];
for(var i = 0; i < data.length; i += 2) {
for (var i = 0; i < data.length; i += 2) {
objects.push({value: data[i], score: parseFloat(data[i + 1])});
}
callback(null, objects);
@@ -94,7 +94,7 @@ module.exports = function (redisClient, module) {
return callback(null, []);
}
var multi = redisClient.multi();
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
multi.zcard(keys[i]);
}
multi.exec(callback);
@@ -106,7 +106,7 @@ module.exports = function (redisClient, module) {
module.sortedSetsRanks = function (keys, values, callback) {
var multi = redisClient.multi();
for(var i = 0; i < values.length; i += 1) {
for (var i = 0; i < values.length; i += 1) {
multi.zrank(keys[i], values[i]);
}
multi.exec(callback);
@@ -114,7 +114,7 @@ module.exports = function (redisClient, module) {
module.sortedSetRanks = function (key, values, callback) {
var multi = redisClient.multi();
for(var i = 0; i < values.length; i += 1) {
for (var i = 0; i < values.length; i += 1) {
multi.zrank(key, values[i]);
}
multi.exec(callback);

View File

@@ -23,7 +23,7 @@ module.exports = function (redisClient, module) {
var args = [key];
for(var i = 0; i < scores.length; i += 1) {
for (var i = 0; i < scores.length; i += 1) {
args.push(scores[i], values[i]);
}
@@ -36,7 +36,7 @@ module.exports = function (redisClient, module) {
callback = callback || function () {};
var multi = redisClient.multi();
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
multi.zadd(keys[i], score, value);
}

View File

@@ -70,7 +70,7 @@ module.exports = function (redisClient, module) {
}
results = results[1] || [];
var objects = [];
for(var i = 0; i < results.length; i += 2) {
for (var i = 0; i < results.length; i += 2) {
objects.push({value: results[i], score: parseFloat(results[i + 1])});
}
callback(null, objects);

View File

@@ -28,7 +28,7 @@ module.exports = function (redisClient, module) {
module.sortedSetsRemoveRangeByScore = function (keys, min, max, callback) {
callback = callback || function () {};
var multi = redisClient.multi();
for(var i = 0; i < keys.length; i += 1) {
for (var i = 0; i < keys.length; i += 1) {
multi.zremrangebyscore(keys[i], min, max);
}
multi.exec(function (err) {

View File

@@ -51,7 +51,7 @@ module.exports = function (redisClient, module) {
}
results = results[1] || [];
var objects = [];
for(var i = 0; i < results.length; i += 2) {
for (var i = 0; i < results.length; i += 2) {
objects.push({value: results[i], score: parseFloat(results[i + 1])});
}
callback(null, objects);

View File

@@ -4,7 +4,7 @@
var async = require('async');
var validator = require('validator');
var db = require('./database');
var db = require('./database');
var batch = require('./batch');
var user = require('./user');
var utils = require('../public/src/utils');

View File

@@ -100,7 +100,7 @@ file.existsSync = function (path) {
var exists = false;
try {
exists = fs.statSync(path);
} catch(err) {
} catch (err) {
exists = false;
}

View File

@@ -38,7 +38,7 @@ module.exports = function (Groups) {
};
Groups.sort = function (strategy, groups, next) {
switch(strategy) {
switch (strategy) {
case 'count':
groups = groups.sort(function (a, b) {
return a.slug > b.slug;
@@ -77,7 +77,7 @@ module.exports = function (Groups) {
},
function (users, next) {
var uids = [];
for(var i = 0; i < users.length; i += 1) {
for (var i = 0; i < users.length; i += 1) {
var field = users[i][searchBy];
if (field.toLowerCase().startsWith(query)) {
uids.push(users[i].uid);

View File

@@ -131,7 +131,7 @@ module.exports = function (Groups) {
},
function (currentValue, next) {
var currentlyPrivate = parseInt(currentValue.private, 10) === 1;
if (!currentlyPrivate || currentlyPrivate === isPrivate) {
if (!currentlyPrivate || currentlyPrivate === isPrivate) {
return callback();
}
db.getSetMembers('group:' + groupName + ':pending', next);

View File

@@ -10,7 +10,7 @@ HotSwap.prepare = function (app) {
HotSwap.find = function (id) {
if (stack) {
for(var x = 0, numEntries = stack.length; x < numEntries; x += 1) {
for (var x = 0, numEntries = stack.length; x < numEntries; x += 1) {
if (stack[x].handle.hotswapId === id) {
return x;
}

View File

@@ -153,7 +153,7 @@ function completeConfigSetup(config, next) {
// Add CI object
if (install.ciVals) {
config.test_database = {};
for(var prop in install.ciVals) {
for (var prop in install.ciVals) {
if (install.ciVals.hasOwnProperty(prop)) {
config.test_database[prop] = install.ciVals[prop];
}

View File

@@ -59,9 +59,9 @@ var opts = {
* If logging is currently enabled, create a stream.
* Otherwise, close the current stream
*/
if(meta.config.loggerStatus > 0 || meta.config.loggerIOStatus) {
if (meta.config.loggerStatus > 0 || meta.config.loggerIOStatus) {
var stream = Logger.open(value);
if(stream) {
if (stream) {
opts.streams.log.f = stream;
} else {
opts.streams.log.f = process.stdout;
@@ -74,11 +74,11 @@ var opts = {
Logger.open = function (value) {
/* Open the streams to log to: either a path or stdout */
var stream;
if(value) {
if(file.existsSync(value)) {
if (value) {
if (file.existsSync(value)) {
var stats = fs.statSync(value);
if(stats) {
if(stats.isDirectory()) {
if (stats) {
if (stats.isDirectory()) {
stream = fs.createWriteStream(path.join(value, 'nodebb.log'), {flags: 'a'});
} else {
stream = fs.createWriteStream(value, {flags: 'a'});
@@ -89,7 +89,7 @@ var opts = {
}
if(stream) {
if (stream) {
stream.on('error', function (err) {
winston.error(err.message);
});
@@ -101,7 +101,7 @@ var opts = {
};
Logger.close = function (stream) {
if(stream.f !== process.stdout && stream.f) {
if (stream.f !== process.stdout && stream.f) {
stream.end();
}
stream.f = null;
@@ -117,7 +117,7 @@ var opts = {
};
Logger.express_open = function () {
if(opts.express.set !== 1) {
if (opts.express.set !== 1) {
opts.express.set = 1;
opts.express.app.use(Logger.expressLogger);
}
@@ -133,7 +133,7 @@ var opts = {
*
* This hijack allows us to turn logger on/off dynamically within express
*/
if(meta.config.loggerStatus > 0) {
if (meta.config.loggerStatus > 0) {
return opts.express.ofn(req, res, next);
} else {
return next();
@@ -148,7 +148,7 @@ var opts = {
*/
try {
return 'io: ' + _uid + ' ' + _type + ' ' + util.inspect(Array.prototype.slice.call(_args)) + '\n';
} catch(err) {
} catch (err) {
winston.info("Logger.prepare_io_string: Failed", err);
return "error";
}
@@ -165,11 +165,11 @@ var opts = {
for (var sid in clients) {
if (clients.hasOwnProperty(sid)) {
var client = clients[sid];
if(client.oEmit && client.oEmit !== client.emit) {
if (client.oEmit && client.oEmit !== client.emit) {
client.emit = client.oEmit;
}
if(client.$oEmit && client.$oEmit !== client.$emit) {
if (client.$oEmit && client.$oEmit !== client.$emit) {
client.$emit = client.$oEmit;
}
}
@@ -186,7 +186,7 @@ var opts = {
}
var clients = socket.io.sockets.sockets;
for(var sid in clients) {
for (var sid in clients) {
if (clients.hasOwnProperty(sid)) {
Logger.io_one(clients[sid], clients[sid].uid);
}
@@ -199,13 +199,13 @@ var opts = {
*/
function override(method, name, errorMsg) {
return function () {
if(opts.streams.log.f) {
if (opts.streams.log.f) {
opts.streams.log.f.write(Logger.prepare_io_string(name, uid, arguments));
}
try {
method.apply(socket, arguments);
} catch(err) {
} catch (err) {
winston.info(errorMsg, err);
}
};

View File

@@ -83,7 +83,7 @@ exports.buildTargets = function (targets, callback) {
function (next) {
async.eachSeries(targets, function (target, next) {
var startTime;
switch(target) {
switch (target) {
case 'js':
setImmediate(next);
break;

View File

@@ -31,7 +31,7 @@ module.exports = function (Meta) {
try {
pkgData = JSON.parse(pkgData);
} catch(e) {
} catch (e) {
process.stdout.write('[' + 'missing'.red + '] ' + module.bold + ' is a required dependency but could not be found\n');
depsMissing = true;
return next(true);

View File

@@ -150,7 +150,7 @@ module.exports = function (Meta) {
});
minifier.on('message', function (message) {
switch(message.type) {
switch (message.type) {
case 'end':
Meta.js.target[target].cache = message.minified;
Meta.js.target[target].map = message.sourceMap;
@@ -226,7 +226,7 @@ module.exports = function (Meta) {
* Check if the parent process is running with the debug option --debug (or --debug-brk)
*/
var forkProcessParams = {};
if(global.v8debug || parseInt(process.execArgv.indexOf('--debug'), 10) !== -1) {
if (global.v8debug || parseInt(process.execArgv.indexOf('--debug'), 10) !== -1) {
/**
* use the line below if you want to debug minifier.js script too (or even --debug-brk option, but
* you'll have to setup your debugger and connect to the forked process)

View File

@@ -120,7 +120,7 @@ function compile(callback) {
var matches = null;
var regex = /[ \t]*<!-- IMPORT ([\s\S]*?)? -->[ \t]*/;
while((matches = file.match(regex)) !== null) {
while ((matches = file.match(regex)) !== null) {
var partial = "/" + matches[1];
if (paths[partial] && relativePath !== partial) {

View File

@@ -78,7 +78,7 @@ module.exports = function (Meta) {
'theme:src': '',
};
switch(data.type) {
switch (data.type) {
case 'local':
async.waterfall([
async.apply(Meta.configs.get, 'theme:id'),

View File

@@ -190,7 +190,7 @@ middleware.processTimeagoLocales = function (req, res, next) {
try {
exists = fs.accessSync(localPath, fs.F_OK | fs.R_OK);
} catch(e) {
} catch (e) {
exists = false;
}

View File

@@ -1,7 +1,7 @@
'use strict';
var async = require('async');
var nconf = require('nconf');
var nconf = require('nconf');
var meta = require('../meta');
var user = require('../user');

View File

@@ -460,7 +460,7 @@ var utils = require('../public/src/utils');
return notifications;
}
switch(mergeId) {
switch (mergeId) {
// intentional fall-through
case 'notifications:upvoted_your_post_in':
case 'notifications:user_started_following_you':

View File

@@ -26,7 +26,7 @@ pagination.create = function (currentPage, pageCount, queryObj) {
if (startPage > pageCount - 5) {
startPage -= 2 - (pageCount - currentPage);
}
for(var i = 0; i < 5; i += 1) {
for (var i = 0; i < 5; i += 1) {
pagesToShow.push(startPage + i);
}

View File

@@ -13,7 +13,7 @@
function forkChild(message, callback) {
var forkProcessParams = {};
if(global.v8debug || parseInt(process.execArgv.indexOf('--debug'), 10) !== -1) {
if (global.v8debug || parseInt(process.execArgv.indexOf('--debug'), 10) !== -1) {
forkProcessParams = {execArgv: ['--debug=' + (5859), '--nolazy']};
}
var child = fork('./bcrypt', [], forkProcessParams);

View File

@@ -107,7 +107,7 @@ var middleware;
if (Plugins.versionWarning.length && nconf.get('isPrimary') === 'true') {
process.stdout.write('\n');
winston.warn('[plugins/load] The following plugins may not be compatible with your version of NodeBB. This may cause unintended behaviour or crashing. In the event of an unresponsive NodeBB caused by this plugin, run `./nodebb reset -p PLUGINNAME` to disable it.');
for(var x = 0, numPlugins = Plugins.versionWarning.length; x < numPlugins; x += 1) {
for (var x = 0, numPlugins = Plugins.versionWarning.length; x < numPlugins; x += 1) {
process.stdout.write(' * '.yellow + Plugins.versionWarning[x] + '\n');
}
process.stdout.write('\n');
@@ -252,7 +252,7 @@ var middleware;
var pluginMap = {};
var dependencies = require(path.join(nconf.get('base_dir'), 'package.json')).dependencies;
apiReturn = apiReturn || [];
for(var i = 0; i < apiReturn.length; i += 1) {
for (var i = 0; i < apiReturn.length; i += 1) {
apiReturn[i].id = apiReturn[i].name;
apiReturn[i].installed = false;
apiReturn[i].active = false;

View File

@@ -160,7 +160,7 @@ module.exports = function (Plugins) {
next.apply(null, arguments);
}
});
} catch(err) {
} catch (err) {
winston.error('[plugins] Error executing \'' + hook + '\' in plugin \'' + hookObj.id + '\'');
winston.error(err);
clearTimeout(timeoutId);

View File

@@ -140,7 +140,7 @@ module.exports = function (Plugins) {
} else {
callback();
}
} catch(err) {
} catch (err) {
winston.error(err.stack);
winston.warn('[plugins] Unable to parse library for: ' + pluginData.id);
callback();
@@ -301,7 +301,7 @@ module.exports = function (Plugins) {
pluginData.repository = packageData.repository;
pluginData.nbbpm = packageData.nbbpm;
pluginData.path = pluginPath;
} catch(err) {
} catch (err) {
var pluginDir = pluginPath.split(path.sep);
pluginDir = pluginDir[pluginDir.length - 1];

View File

@@ -240,14 +240,14 @@ module.exports = function (Posts) {
function (posts, next) {
// Parse out flag data into its own object inside each post hash
async.map(posts, function (postObj, next) {
for(var prop in postObj) {
for (var prop in postObj) {
postObj.flagData = postObj.flagData || {};
if (postObj.hasOwnProperty(prop) && prop.startsWith('flag:')) {
postObj.flagData[prop.slice(5)] = postObj[prop];
if (prop === 'flag:state') {
switch(postObj[prop]) {
switch (postObj[prop]) {
case 'open':
postObj.flagData.labelClass = 'info';
break;
@@ -296,14 +296,14 @@ module.exports = function (Posts) {
}
// Track new additions
for(prop in flagObj) {
for (prop in flagObj) {
if (flagObj.hasOwnProperty(prop) && !postData.hasOwnProperty('flag:' + prop) && flagObj[prop].length) {
changes.push(prop);
}
}
// Track changed items
for(prop in postData) {
for (prop in postData) {
if (
postData.hasOwnProperty(prop) && prop.startsWith('flag:') &&
flagObj.hasOwnProperty(prop.slice(5)) &&
@@ -324,7 +324,7 @@ module.exports = function (Posts) {
var history = JSON.parse(postData['flag:history'] || '[]');
changes.forEach(function (property) {
switch(property) {
switch (property) {
case 'assignee': // intentional fall-through
case 'state':
history.unshift({

View File

@@ -68,7 +68,7 @@ module.exports = function (Posts) {
content = content.slice(0, current.index + 6) + absolute + content.slice(current.index + 6 + current[1].length);
}
} catch(err) {
} catch (err) {
winston.verbose(err.messsage);
}
}

View File

@@ -136,7 +136,7 @@ module.exports = function (Posts) {
function toObject(key, data) {
var obj = {};
for(var i = 0; i < data.length; i += 1) {
for (var i = 0; i < data.length; i += 1) {
obj[data[i][key]] = data[i];
}
return obj;

View File

@@ -30,7 +30,7 @@ module.exports = function (Posts) {
function (deleted, next) {
if (parseInt(deleted, 10) === 1 && isDelete) {
return next(new Error('[[error:post-already-deleted]]'));
} else if(parseInt(deleted, 10) !== 1 && !isDelete) {
} else if (parseInt(deleted, 10) !== 1 && !isDelete) {
return next(new Error('[[error:post-already-restored]]'));
}

View File

@@ -66,7 +66,7 @@ module.exports = function (privileges) {
memberData.forEach(function (member) {
member.privileges = {};
for(var x = 0, numPrivs = userPrivileges.length; x < numPrivs; x += 1) {
for (var x = 0, numPrivs = userPrivileges.length; x < numPrivs; x += 1) {
member.privileges[userPrivileges[x]] = memberSets[x].indexOf(parseInt(member.uid, 10)) !== -1;
}
});
@@ -117,7 +117,7 @@ module.exports = function (privileges) {
var memberData = groupNames.map(function (member) {
memberPrivs = {};
for(var x = 0, numPrivs = groupPrivileges.length; x < numPrivs; x += 1) {
for (var x = 0, numPrivs = groupPrivileges.length; x < numPrivs; x += 1) {
memberPrivs[groupPrivileges[x]] = memberSets[x].indexOf(member) !== -1;
}
return {

View File

@@ -107,7 +107,7 @@ helpers.isUsersAllowedTo = function (privilege, uids, cid, callback) {
}
var result = [];
for(var i = 0; i < uids.length; i += 1) {
for (var i = 0; i < uids.length; i += 1) {
result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
}

View File

@@ -26,7 +26,7 @@ var PubSub = function () {
try {
var msg = JSON.parse(message);
self.emit(msg.event, msg.data);
} catch(err) {
} catch (err) {
winston.error(err.stack);
}
});

View File

@@ -4,7 +4,7 @@ var express = require('express');
var uploadsController = require('../controllers/uploads');
module.exports = function (app, middleware, controllers) {
module.exports = function (app, middleware, controllers) {
var router = express.Router();
app.use('/api', router);

View File

@@ -98,7 +98,7 @@ module.exports = function (app, middleware, hotswapIds) {
var ensureLoggedIn = require('connect-ensure-login');
if (Array.isArray(hotswapIds) && hotswapIds.length) {
for(var idx, x = 0; x < hotswapIds.length; x += 1) {
for (var idx, x = 0; x < hotswapIds.length; x += 1) {
idx = routers.push(express.Router()) - 1;
routers[idx].hotswapId = hotswapIds[x];
}
@@ -132,7 +132,7 @@ module.exports = function (app, middleware, hotswapIds) {
userRoutes(router, middleware, controllers);
groupRoutes(router, middleware, controllers);
for(var x = 0; x < routers.length; x += 1) {
for (var x = 0; x < routers.length; x += 1) {
app.use(relativePath, routers[x]);
}

View File

@@ -38,7 +38,7 @@ sitemap.render = function (callback) {
numPages = Math.ceil(tids.length / numTopics);
}
for(var x = 1; x <= numPages; x += 1) {
for (var x = 1; x <= numPages; x += 1) {
returnData.topics.push(x);
}

View File

@@ -13,7 +13,7 @@ var plugins = require('../../plugins');
var User = {};
User.makeAdmins = function (socket, uids, callback) {
if(!Array.isArray(uids)) {
if (!Array.isArray(uids)) {
return callback(new Error('[[error:invalid-data]]'));
}
@@ -22,7 +22,7 @@ User.makeAdmins = function (socket, uids, callback) {
return callback(err);
}
for(var i = 0; i < userData.length; i += 1) {
for (var i = 0; i < userData.length; i += 1) {
if (userData[i] && parseInt(userData[i].banned, 10) === 1) {
return callback(new Error('[[error:cant-make-banned-users-admin]]'));
}
@@ -35,7 +35,7 @@ User.makeAdmins = function (socket, uids, callback) {
};
User.removeAdmins = function (socket, uids, callback) {
if(!Array.isArray(uids)) {
if (!Array.isArray(uids)) {
return callback(new Error('[[error:invalid-data]]'));
}

View File

@@ -44,7 +44,7 @@ SocketCategories.getWatchedCategories = function (socket, data, callback) {
if (err) {
return callback(err);
}
var watchedCategories = results.categories.filter(function (category) {
var watchedCategories = results.categories.filter(function (category) {
return category && results.ignoredCids.indexOf(category.cid.toString()) === -1;
});

View File

@@ -241,7 +241,7 @@ SocketGroups.search = function (socket, data, callback) {
};
SocketGroups.loadMore = function (socket, data, callback) {
if (!data.sort || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) {
if (!data.sort || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) {
return callback();
}

View File

@@ -62,7 +62,7 @@ module.exports = function (SocketPosts) {
return callback(err, []);
}
async.map(data, function (uids, next) {
async.map(data, function (uids, next) {
var otherCount = 0;
if (uids.length > 6) {
otherCount = uids.length - 5;

View File

@@ -11,7 +11,7 @@ var social = require('../../social');
module.exports = function (SocketTopics) {
SocketTopics.loadMore = function (socket, data, callback) {
if (!data || !data.tid || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) {
if (!data || !data.tid || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) {
return callback(new Error('[[error:invalid-data]]'));
}
var userPrivileges;

View File

@@ -26,7 +26,7 @@ module.exports = function (SocketUser) {
user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next);
},
function (next) {
switch(type) {
switch (type) {
case 'default':
next(null, '');
break;

View File

@@ -56,7 +56,7 @@ start.start = function () {
},
], function (err) {
if (err) {
switch(err.message) {
switch (err.message) {
case 'schema-out-of-date':
winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
winston.warn(' ./nodebb upgrade');

View File

@@ -69,7 +69,7 @@ module.exports = function (Topics) {
userData: function (next) {
var uids = [];
for(var i = 0; i < postData.length; i += 1) {
for (var i = 0; i < postData.length; i += 1) {
if (postData[i] && uids.indexOf(postData[i].uid) === -1) {
uids.push(postData[i].uid);
}
@@ -90,7 +90,7 @@ module.exports = function (Topics) {
},
editors: function (next) {
var editors = [];
for(var i = 0; i < postData.length; i += 1) {
for (var i = 0; i < postData.length; i += 1) {
if (postData[i] && postData[i].editor && editors.indexOf(postData[i].editor) === -1) {
editors.push(postData[i].editor);
}

View File

@@ -7,7 +7,7 @@ var db = require('../database');
var plugins = require('../plugins');
var privileges = require('../privileges');
var user = require('../user');
var categories = require('../categories');
var categories = require('../categories');
module.exports = function (Topics) {
var terms = {

View File

@@ -366,7 +366,7 @@ module.exports = function (Topics) {
query = query.toLowerCase();
var matches = [];
for(var i = 0; i < tags.length; i += 1) {
for (var i = 0; i < tags.length; i += 1) {
if (tags[i].toLowerCase().startsWith(query)) {
matches.push(tags[i]);
if (matches.length > 19) {

View File

@@ -30,7 +30,7 @@ module.exports = function (Topics) {
delete topic.teaserPid;
}
switch(meta.config.teaserPost) {
switch (meta.config.teaserPost) {
case 'first':
teaserPids.push(topic.mainPid);
break;

View File

@@ -46,7 +46,7 @@ module.exports = function (Topics) {
if (parseInt(topicData.deleted, 10) === 1 && isDelete) {
return callback(new Error('[[error:topic-already-deleted]]'));
} else if(parseInt(topicData.deleted, 10) !== 1 && !isDelete) {
} else if (parseInt(topicData.deleted, 10) !== 1 && !isDelete) {
return callback(new Error('[[error:topic-already-restored]]'));
}

View File

@@ -52,7 +52,7 @@ Upgrade.upgrade = function (callback) {
return next(err);
}
if(!value) {
if (!value) {
db.set('schemaDate', latestSchema, function () {
next();
});
@@ -317,13 +317,13 @@ Upgrade.upgrade = function (callback) {
// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 24!!!
], function (err) {
if (!err) {
if(updatesMade) {
if (updatesMade) {
winston.info('[upgrade] Schema update complete!');
} else {
winston.info('[upgrade] Schema already up to date!');
}
} else {
switch(err.message) {
switch (err.message) {
case 'upgrade-not-possible':
winston.error('[upgrade] NodeBB upgrade could not complete, as your database schema is too far out of date.');
winston.error('[upgrade] Please ensure that you did not skip any minor version upgrades.');

View File

@@ -18,7 +18,7 @@ module.exports = function (User) {
}
User.isDataValid(data, function (err) {
if (err) {
if (err) {
return callback(err);
}
var timestamp = data.timestamp || Date.now();

View File

@@ -126,7 +126,7 @@ module.exports = function (User) {
user.status = User.getStatus(user);
}
for(var i = 0; i < fieldsToRemove.length; i += 1) {
for (var i = 0; i < fieldsToRemove.length; i += 1) {
user[fieldsToRemove[i]] = undefined;
}

View File

@@ -57,7 +57,7 @@ module.exports = function (User) {
}
User.getUserFields(uid, ['username', 'userslug', 'fullname', 'email'], next);
},
function (_userData, next) {
function (_userData, next) {
userData = _userData;
plugins.fireHook('static:user.delete', {uid: uid}, next);
},

View File

@@ -22,7 +22,7 @@ module.exports = function (User) {
}
// Terminate any active cron jobs
for(var jobId in jobs) {
for (var jobId in jobs) {
if (jobs.hasOwnProperty(jobId)) {
winston.verbose('[user/jobs] Terminating job (' + jobId + ')');
jobs[jobId].stop();

View File

@@ -64,7 +64,7 @@ var privileges = require('../privileges');
async.waterfall([
async.apply(db.getSortedSetRevRange, set, start, stop),
function (nids, next) {
if(!Array.isArray(nids) || !nids.length) {
if (!Array.isArray(nids) || !nids.length) {
return callback(null, []);
}

View File

@@ -170,7 +170,7 @@ module.exports = function (User) {
db.sortedSetAdd('email:uid', uid, newEmail.toLowerCase(), next);
},
function (next) {
db.sortedSetAdd('email:sorted', 0, newEmail.toLowerCase() + ':' + uid, next);
db.sortedSetAdd('email:sorted', 0, newEmail.toLowerCase() + ':' + uid, next);
},
function (next) {
db.sortedSetAdd('user:' + uid + ':emails', Date.now(), newEmail + ':' + Date.now(), next);

View File

@@ -135,9 +135,9 @@ module.exports = function (User) {
});
} else {
userData.sort(function (u1, u2) {
if(u1[sortBy] < u2[sortBy]) {
if (u1[sortBy] < u2[sortBy]) {
return -1;
} else if(u1[sortBy] > u2[sortBy]) {
} else if (u1[sortBy] > u2[sortBy]) {
return 1;
}
return 0;

View File

@@ -89,7 +89,7 @@ widgets.getAreas = function (templates, locations, callback) {
if (data && data[index] && data[index][location]) {
try {
returnData[template][location] = JSON.parse(data[index][location]);
} catch(err) {
} catch (err) {
winston.error('can not parse widget data. template: ' + template + ' location: ' + location);
returnData[template][location] = [];
}
@@ -113,7 +113,7 @@ widgets.getArea = function (template, location, callback) {
}
try {
result = JSON.parse(result);
} catch(err) {
} catch (err) {
return callback(err);
}