ESlint no-plusplus

and no-empty, space-unary-ops

.eslintrc

@@ -12,7 +12,12 @@
         }],
         "import/no-unresolved": "off",
         "import/no-extraneous-dependencies": "off",
+        "import/no-dynamic-require": "off",
+        "no-bitwise": "off",
         "newline-per-chained-call": "off",
+        "no-console": "off",
+        "no-empty": ["error", { "allowEmptyCatch": true }],
+
         // "linebreak-style": "off",
         // "one-var": "off",
         // "no-undef": "off",
@@ -84,7 +89,6 @@
         "no-multi-spaces": "off",
         "quotes": "off",
         "keyword-spacing": "off",
-        "no-plusplus": "off",
         "no-mixed-operators": "off",
         "comma-spacing": "off",
         "global-require": "off",
@@ -99,11 +103,9 @@
         "space-in-parens": "off",
         "block-spacing": "off",
         "quote-props": "off",
-        "no-console": "off",
-        "space-unary-ops": "off",
-        "import/no-dynamic-require": "off",
-        "no-bitwise": "off",
-        "no-empty": "off",
+        // "space-unary-ops": "off",
+        // "no-plusplus": "off",
+        // "no-empty": "off",
         // "dot-notation": "off",
         // "func-call-spacing": "off",
         // "array-bracket-spacing": "off",

Gruntfile.js

@@ -46,9 +46,9 @@ module.exports = function (grunt) {
 			updateWorker.kill('SIGKILL');
 		}
 		updateWorker = fork('app.js', updateArgs, { env: env });
-		++running;
+		running += 1;
 		updateWorker.on('exit', function () {
-			--running;
+			running -= 1;
 			if (running === 0) {
 				worker = fork('app.js', args, { env: env });
 				worker.on('message', function () {

app.js

@@ -155,7 +155,7 @@ function setup() {
 
 		var separator = '     ';
 		if (process.stdout.columns > 10) {
-			for(var x = 0,cols = process.stdout.columns - 10; x < cols; x++) {
+			for(var x = 0,cols = process.stdout.columns - 10; x < cols; x += 1) {
 				separator += '=';
 			}
 		}

install/databases.js

@@ -74,7 +74,7 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 	}
 
 	var allQuestions = questions.redis.concat(questions.mongo);
-	for (var x = 0; x < allQuestions.length; x++) {
+	for (var x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}
 

loader.js

@@ -52,7 +52,7 @@ Loader.addWorkerEvents = function (worker) {
 	worker.on('exit', function (code, signal) {
 		if (code !== 0) {
 			if (Loader.timesStarted < numProcs * 3) {
-				Loader.timesStarted++;
+				Loader.timesStarted += 1;
 				if (Loader.crashTimer) {
 					clearTimeout(Loader.crashTimer);
 				}
@@ -93,7 +93,7 @@ Loader.start = function (callback) {
 	numProcs = getPorts().length;
 	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');
 
-	for (var x = 0; x < numProcs; ++x) {
+	for (var x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}
 

public/src/admin/extend/widgets.js

@@ -117,7 +117,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) {
 					location: location,
 					widgets: widgets,
 				}, function (err) {
-					total--;
+					total -= 1;
 
 					if (err) {
 						app.alertError(err.message);
@@ -209,13 +209,13 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) {
 		$.get(RELATIVE_PATH + '/api/admin/extend/widgets', function (data) {
 			var areas = data.areas;
 
-			for(var i = 0; i < areas.length; ++i) {
+			for(var i = 0; i < areas.length; i += 1) {
 				var area = areas[i];
 				var widgetArea = $('#widgets .area[data-template="' + area.template + '"][data-location="' + area.location + '"]').find('.widget-area');
 
 				widgetArea.html('');
 
-				for (var k = 0; k < area.data.length; ++k) {
+				for (var k = 0; k < area.data.length; k += 1) {
 					var widgetData = area.data[k];
 					var widgetEl = $('.available-widgets [data-widget="' + widgetData.widget + '"]').clone(true).removeClass('hide');
 

public/src/admin/general/dashboard.js

@@ -387,7 +387,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
 		graphs.topics.data.datasets[0].backgroundColor = [];
 		graphs.topics.data.datasets[0].hoverBackgroundColor = [];
 
-		for (var i = 0, ii = tids.length; i < ii; i++) {
+		for (var i = 0, ii = tids.length; i < ii; i += 1) {
 			graphs.topics.data.labels.push(topics[tids[i]].title);
 			graphs.topics.data.datasets[0].data.push(topics[tids[i]].value);
 			graphs.topics.data.datasets[0].backgroundColor.push(topicColors[i]);
@@ -397,7 +397,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
 		function buildTopicsLegend() {
 			var legend = $('#topics-legend').html('');
 
-			for (var i = 0, ii = tids.length; i < ii; i++) {
+			for (var i = 0, ii = tids.length; i < ii; i += 1) {
 				var topic = topics[tids[i]];
 				var	label = topic.value === '0' ? topic.title : '<a title="' + topic.title + '"href="' + RELATIVE_PATH + '/topic/' + tids[i] + '" target="_blank"> ' + topic.title + '</a>';
 

public/src/admin/manage/categories.js

@@ -135,7 +135,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 			var list = parentCategory.toArray();
 			var len = list.length;
 
-			for(i; i < len; ++i) {
+			for(i; i < len; i += 1) {
 				modified[list[i]] = {
 					order: (i + 1),
 				};
@@ -166,7 +166,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 				if (category.name !== translated) {
 					category.name = translated;
 				}
-				++count;
+				count += 1;
 
 				if (count === parent.length) {
 					continueRender();
@@ -187,7 +187,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 					container.append(html);
 
 					// Handle and children categories in this level have
-					for(var x = 0,numCategories = categories.length; x < numCategories; x++) {
+					for(var x = 0, numCategories = categories.length; x < numCategories; x += 1) {
 						renderList(categories[x].children, $('li[data-cid="' + categories[x].cid + '"]'), categories[x].cid);
 					}
 

public/src/admin/manage/category.js

@@ -295,7 +295,7 @@ define('admin/manage/category', [
 				privs.push(el.getAttribute('data-privilege'));
 			}
 		});
-		for(var x = 0,numPrivs = privs.length; x < numPrivs; x++) {
+		for(var x = 0, numPrivs = privs.length; x < numPrivs; x += 1) {
 			var inputs = $('.privilege-table tr[data-group-name]:not([data-group-name="registered-users"],[data-group-name="guests"]) td[data-privilege="' + privs[x] + '"] input');
 			inputs.each(function (idx, el) {
 				if (!el.checked) {

public/src/admin/manage/group.js

@@ -51,7 +51,7 @@ define('admin/manage/group', [
 
 						groupDetailsSearchResults.empty();
 
-						for (x = 0; x < numResults; x++) {
+						for (x = 0; x < numResults; x += 1) {
 							foundUser = $('<li />');
 							foundUser
 								.attr({title: results.users[x].username,

public/src/admin/settings.js

@@ -36,7 +36,7 @@ define('admin/settings', ['uploader'], function (uploader) {
 			app.flags._unsaved = true;
 		});
 
-		for (x = 0; x < numFields; x++) {
+		for (x = 0; x < numFields; x += 1) {
 			field = fields.eq(x);
 			key = field.attr('data-field');
 			inputType = field.attr('type');

public/src/ajaxify.js

@@ -196,7 +196,8 @@ $(document).ready(function () {
 
 	ajaxify.end = function (url, tpl_url) {
 		function done() {
-			if (--count === 0) {
+			count -= 1;
+			if (count === 0) {
 				$(window).trigger('action:ajaxify.end', {url: url, tpl_url: tpl_url, title: ajaxify.data.title});
 			}
 		}

public/src/client/category.js

@@ -226,7 +226,7 @@ define('forum/category', [
 				}
 
 				if (numTopics > 0) {
-					for (var x = 0; x < numTopics; x++) {
+					for (var x = 0; x < numTopics; x += 1) {
 						var pinned = $(topics[x]).hasClass('pinned');
 						if (!pinned) {
 							topic.insertBefore(topics[x]);

public/src/client/category/tools.js

@@ -180,7 +180,7 @@ define('forum/category/tools', [
 	}
 
 	function isAny(method, tids) {
-		for(var i = 0; i < tids.length; ++i) {
+		for(var i = 0; i < tids.length; i += 1) {
 			if(method(tids[i])) {
 				return true;
 			}
@@ -189,7 +189,7 @@ define('forum/category/tools', [
 	}
 
 	function areAll(method, tids) {
-		for(var i = 0; i < tids.length; ++i) {
+		for(var i = 0; i < tids.length; i += 1) {
 			if(!method(tids[i])) {
 				return false;
 			}

public/src/client/recent.js

@@ -46,13 +46,13 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function (infinit
 			return;
 		}
 
-		++newTopicCount;
+		newTopicCount += 1;
 		Recent.updateAlertText();
 	}
 
 	function onNewPost(data) {
 		function showAlert() {
-			++newPostCount;
+			newPostCount += 1;
 			Recent.updateAlertText();
 		}
 

public/src/client/search.js

@@ -137,7 +137,7 @@ define('forum/search', ['search', 'autocomplete'], function (searchModule, autoc
 
 			result.html(result.html().replace(regex, '<strong>$1</strong>'));
 
-			for (var i = 0, ii = nested.length; i < ii; i++) {
+			for (var i = 0, ii = nested.length; i < ii; i += 1) {
 				result.html(result.html().replace('<!-- ' + i + ' -->', nested[i].html()));
 			}
 		});

public/src/client/topic/events.js

@@ -165,7 +165,7 @@ define('forum/topic/events', [
 			return true;
 		}
 
-		for (var i = 0; i < tags.length; ++i) {
+		for (var i = 0; i < tags.length; i += 1) {
 			if (!$('.tags .tag-item[data-tag="' + tags[i].value + '"]').length) {
 				return true;
 			}
@@ -178,7 +178,7 @@ define('forum/topic/events', [
 			$(this).remove();
 			posts.showBottomPostBar();
 		});
-		ajaxify.data.postcount --;
+		ajaxify.data.postcount -= 1;
 		postTools.updatePostCount(ajaxify.data.postcount);
 		require(['forum/topic/replies'], function (replies) {
 			replies.onPostPurged(postData);

public/src/client/topic/posts.js

@@ -28,7 +28,7 @@ define('forum/topic/posts', [
 
 		updatePostCounts(data.posts);
 
-		ajaxify.data.postcount ++;
+		ajaxify.data.postcount += 1;
 		postTools.updatePostCount(ajaxify.data.postcount);
 
 		if (config.usePagination) {
@@ -54,7 +54,7 @@ define('forum/topic/posts', [
 	};
 
 	function updatePostCounts(posts) {
-		for (var i = 0; i < posts.length; ++i) {
+		for (var i = 0; i < posts.length; i += 1) {
 			var cmp = components.get('user/postcount', posts[i].uid);
 			cmp.html(parseInt(cmp.attr('data-postcount'), 10) + 1);
 			utils.addCommasToNumbers(cmp);

public/src/client/unread.js

@@ -118,7 +118,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', '
 	}
 
 	function removeTids(tids) {
-		for(var i = 0; i < tids.length; ++i) {
+		for(var i = 0; i < tids.length; i += 1) {
 			components.get('category/topic', 'tid', tids[i]).remove();
 		}
 	}

public/src/modules/notifications.js

@@ -125,7 +125,7 @@ define('notifications', ['sounds', 'translator', 'components'], function (sound,
 			});
 
 			translator.toggleTimeagoShorthand();
-			for(var i = 0; i < notifs.length; ++i) {
+			for(var i = 0; i < notifs.length; i += 1) {
 				notifs[i].timeago = $.timeago(new Date(parseInt(notifs[i].datetime, 10)));
 			}
 			translator.toggleTimeagoShorthand();

public/src/modules/settings.js

@@ -129,7 +129,7 @@ define('settings', function () {
 			if (!trim && empty) {
 				return array;
 			}
-			for (var i = 0; i < array.length; i++) {
+			for (var i = 0; i < array.length; i += 1) {
 				var value = array[i];
 				if (trim) {
 					value = value === true ? 1 : value === false ? 0 : typeof value.trim === 'function' ? value.trim() : value;
@@ -226,7 +226,7 @@ define('settings', function () {
 				if (hook != null) {
 					hook.call(Settings, field);
 				}
-				for (var i = 0; i < keyParts.length; i++) {
+				for (var i = 0; i < keyParts.length; i += 1) {
 					var part = keyParts[i];
 					if (part && value != null) {
 						value = value[part];
@@ -254,7 +254,7 @@ define('settings', function () {
 			if (waitingJobs > 0) {
 				waitingJobs -= amount;
 				if (waitingJobs <= 0) {
-					for (var i = 0; i < onReady.length; i++) {
+					for (var i = 0; i < onReady.length; i += 1) {
 						onReady[i]();
 					}
 					onReady = [];
@@ -352,7 +352,7 @@ define('settings', function () {
 			if (typeof service.use === 'function') {
 				service.use.call(Settings);
 			}
-			for (var i = 0; i < types.length; i++) {
+			for (var i = 0; i < types.length; i += 1) {
 				var type = types[i].toLowerCase();
 				if (Settings.plugins[type] == null) {
 					Settings.plugins[type] = service;
@@ -415,14 +415,14 @@ define('settings', function () {
 			if (notify == null) {
 				notify = true;
 			}
-			for (var i = 0; i < fields.length; i++) {
+			for (var i = 0; i < fields.length; i += 1) {
 				var field = $(fields[i]);
 				var value = helper.readValue(field);
 				var parentCfg = Settings.get();
 				var keyParts = field.data('key').split('.');
 				var lastKey = keyParts[keyParts.length - 1];
 				if (keyParts.length > 1) {
-					for (var j = 0; j < keyParts.length - 1; j++) {
+					for (var j = 0; j < keyParts.length - 1; j += 1) {
 						var part = keyParts[j];
 						if (part && parentCfg != null) {
 							parentCfg = parentCfg[part];
@@ -534,7 +534,7 @@ define('settings', function () {
 
 	helper.registerReadyJobs(1);
 	require(DEFAULT_PLUGINS, function () {
-		for (var i = 0; i < arguments.length; i++) {
+		for (var i = 0; i < arguments.length; i += 1) {
 			Settings.registerPlugin(arguments[i]);
 		}
 		helper.beforeReadyJobsDecreased();

public/src/modules/settings/array.js

@@ -115,7 +115,7 @@ define('settings/array', function () {
 			if (!(value instanceof Array)) {
 				value = [];
 			}
-			for (var i = 0; i < value.length; i++) {
+			for (var i = 0; i < value.length; i += 1) {
 				addArrayChildElement(element, key, attributes, value[i], separator.clone(), function (el) {
 					element.append(el);
 				});

public/src/modules/settings/key.js

@@ -131,7 +131,7 @@ define('settings/key', function () {
 		var key = new Key();
 		var sep = /([^CtrlAShifMea#\d]+)(?:#|\d)/.exec(str);
 		var parts = sep != null ? str.split(sep[1]) : [str];
-		for (var i = 0; i < parts.length; i++) {
+		for (var i = 0; i < parts.length; i += 1) {
 			var part = parts[i];
 			switch (part) {
 			case 'C':

public/src/modules/settings/select.js

@@ -4,7 +4,7 @@ define('settings/select', function () {
 	var SettingsSelect;
 
 	function addOptions(element, options) {
-		for (var i = 0; i < options.length; i++) {
+		for (var i = 0; i < options.length; i += 1) {
 			var optionData = options[i];
 			var value = optionData.text || optionData.value;
 			delete optionData.text;

public/src/modules/topicSelect.js

@@ -70,7 +70,7 @@ define('topicSelect', ['components'], function (components) {
 			end = tmp;
 		}
 
-		for(var i = start; i <= end; ++i) {
+		for(var i = start; i <= end; i += 1) {
 			var topic = $('[component="category/topic"]').eq(i);
 			toggleSelect(topic.find('[component="topic/select"]'), isSelected);
 		}