ESlint no-useless-concat, no-mixed-spaces-and-tabs

.eslintrc

@@ -63,8 +63,8 @@
 		// "brace-style": "off",
 		"max-statements-per-line": "off",
 		"no-unused-vars": "off",
-		"no-mixed-spaces-and-tabs": "off",
+		// "no-mixed-spaces-and-tabs": "off",
-		"no-useless-concat": "off",
+		// "no-useless-concat": "off",
 		// "require-jsdoc": "off",
 		// "eqeqeq": "off",
 		// "no-negated-condition": "off",

public/src/admin/extend/rewards.js

@@ -43,7 +43,7 @@ define('admin/extend/rewards', ['translator'], function (translator) {
 				var btn = $(this);
 				var disabled = btn.hasClass('btn-success');
 				var id = $(this).parents('[data-id]').attr('data-id');
-				btn.toggleClass('btn-warning').toggleClass('btn-success').translateHtml('[[admin/extend/rewards:' + disabled ? 'disable' : 'enable' + ']]');
+				btn.toggleClass('btn-warning').toggleClass('btn-success').translateHtml('[[admin/extend/rewards:' + (disabled ? 'disable' : 'enable') + ']]');
 				// send disable api call
 				return false;
 			});

public/src/ajaxify.js

@@ -321,7 +321,7 @@ $(document).ready(function () {
 			callback(templates.cache[template]);
 		} else {
 			$.ajax({
-				url: config.relative_path + '/assets/templates/' + template + '.tpl' + '?' + config['cache-buster'],
+				url: config.relative_path + '/assets/templates/' + template + '.tpl?' + config['cache-buster'],
 				type: 'GET',
 				success: function (data) {
 					callback(data.toString());

public/src/app.js

@@ -558,7 +558,7 @@ app.cacheBuster = null;
 
 		var scriptEl = document.createElement('script');
 		scriptEl.type = 'text/javascript';
-		scriptEl.src = config.relative_path + '/assets/vendor/jquery/js/jquery-ui.js' + '?' + config['cache-buster'];
+		scriptEl.src = config.relative_path + '/assets/vendor/jquery/js/jquery-ui.js?' + config['cache-buster'];
 		scriptEl.onload = callback;
 		document.head.appendChild(scriptEl);
 	};

public/src/widgets.js

@@ -29,7 +29,7 @@
 			}
 		});
 
-		$.get(config.relative_path + '/api/widgets/render' + '?' + config['cache-buster'], {
+		$.get(config.relative_path + '/api/widgets/render?' + config['cache-buster'], {
 			locations: widgetLocations,
 			template: template + '.tpl',
 			url: url,

test/mocks/databasemock.js

@@ -38,26 +38,26 @@
 			'\n===========================================================\n' +
 			'Please, add parameters for test database in config.json\n' +
 			'For example (redis):\n' +
-				'"test_database": {' + '\n' +
+			'"test_database": {\n' +
-				'    "host": "127.0.0.1",' + '\n' +
+			'    "host": "127.0.0.1",\n' +
-				'    "port": "6379",' + '\n' +
+			'    "port": "6379",\n' +
-				'    "password": "",' + '\n' +
+			'    "password": "",\n' +
-				'    "database": "1"' + '\n' +
+			'    "database": "1"\n' +
 			'}\n' +
 			' or (mongo):\n' +
-				'"test_database": {' + '\n' +
+			'"test_database": {\n' +
-				'    "host": "127.0.0.1",' + '\n' +
+			'    "host": "127.0.0.1",\n' +
-				'    "port": "27017",' + '\n' +
+			'    "port": "27017",\n' +
-				'    "password": "",' + '\n' +
+			'    "password": "",\n' +
-				'    "database": "1"' + '\n' +
+			'    "database": "1\n' +
 			'}\n' +
-			' or (mongo) in a replicaset' + '\n' +
+			' or (mongo) in a replicaset\n' +
-			'"test_database": {' + '\n' +
+			'"test_database": {\n' +
-		    '    "host": "127.0.0.1,127.0.0.1,127.0.0.1",' + '\n' +
+			'    "host": "127.0.0.1,127.0.0.1,127.0.0.1",\n' +
-		    '    "port": "27017,27018,27019",' + '\n' +
+			'    "port": "27017,27018,27019",\n' +
-		    '    "username": "",' + '\n' +
+			'    "username": "",\n' +
-		    '    "password": "",' + '\n' +
+			'    "password": "",\n' +
-		    '    "database": "nodebb_test"' + '\n' +
+			'    "database": "nodebb_test"\n' +
 			'}\n' +
 			'==========================================================='
 		);