ESlint no-return-assign

and no-restricted-modules

.eslintrc

@@ -93,9 +93,8 @@
 		"no-script-url": "off",
 		"no-path-concat": "off",
 		"no-unused-expressions": "off",
-		"no-restricted-module": "off",
+		// "no-return-assign": "off",
-		"no-return-assign": "off",
+		// "no-restricted-modules": "off",
-		"no-restricted-modules": "off",
 		// "object-curly-spacing": "off",
 		// "indent": "off",
 		// "padded-blocks": "off",

public/src/modules/settings.js

@@ -239,7 +239,8 @@ define('settings', function () {
 		 @param amount The amount of jobs to register.
 		 */
 		registerReadyJobs: function (amount) {
-			return waitingJobs += amount;
+			waitingJobs += amount;
+			return waitingJobs;
 		},
 		/**
 		 Decreases the amount of jobs before settings are ready by given amount or 1.

public/src/modules/settings/key.js

@@ -61,7 +61,8 @@ define('settings/key', function () {
 			key.code = event.which;
 			key.char = convertKeyCodeToChar(key.code);
 		}
-		return oldKey = key;
+		oldKey = key;
+		return key;
 	}
 
 	/**

public/src/modules/settings/object.js

@@ -104,7 +104,8 @@ define('settings/object', function () {
 				var prop = property.data('prop');
 				var empty = helper.isTrue(property.data('empty'));
 				if (empty || (val !== void 0 && (val == null || val.length !== 0))) {
-					return value[prop] = val;
+					value[prop] = val;
+					return val;
 				}
 			});
 			if (empty || Object.keys(value).length) {