From b971b716bf001de40acacfb6531eb9806f8a41b1 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 15 Aug 2018 09:10:11 +0300
Subject: [PATCH] Update eslint

---
 .eslintrc.json                         | 11 ++++++-----
 client/src/modules/contentmanager.js   |  4 +++-
 client/src/modules/reactcomponents.js  |  8 +++-----
 client/src/modules/theme.js            |  6 ++----
 client/src/structs/settings/setting.js |  2 +-
 core/src/modules/utils.js              |  3 ++-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 6b5a1f49..1e7a261f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -25,17 +25,18 @@
         ],
         "prefer-template": "warn",
         "no-return-await": "error",
-        "indent": [ "error", 4 ],
+        "indent": [ "warn", 4 ],
         "no-lonely-if": "error",
         "no-multiple-empty-lines": [
             "warn",
             { "max": 1 }
         ],
-        "no-tabs": "error",
-        "no-trailing-spaces": "error",
-        "no-unneeded-ternary": "error",
+        "no-tabs": "warn",
+        "no-trailing-spaces": "warn",
+        "no-unneeded-ternary": "warn",
         "no-useless-constructor": "warn",
         "no-var": "error",
-        "prefer-const": "error"
+        "prefer-const": "error",
+        "no-else-return": "error"
     }
 }
diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index d00d661e..3a8aa4c6 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -287,7 +287,9 @@ export default class {
                     newcontent.start(false);
                 }
                 return newcontent;
-            } else this.localContent.splice(index, 1);
+            }
+
+            this.localContent.splice(index, 1);
         } catch (err) {
             Logger.err(this.moduleName, err);
             throw err;
diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 6ba75c87..a80deb49 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -111,13 +111,11 @@ class Helpers {
             if (match) {
                 if (selector.child) {
                     return getDirectChild(item, selector.child);
-                }
-                else if (selector.successor) {
+                } else if (selector.successor) {
                     return this.getFirstChild(parent, key, selector.successor);
                 }
-                else {
-                    return { item, parent, key };
-                }
+
+                return { item, parent, key };
             }
         };
         return this.returnFirst(this.recursiveChildren(rootParent, rootKey), checkFilter.bind(null, selector)) || {};
diff --git a/client/src/modules/theme.js b/client/src/modules/theme.js
index 05acc613..fc5628e1 100644
--- a/client/src/modules/theme.js
+++ b/client/src/modules/theme.js
@@ -79,11 +79,9 @@ export default class Theme extends Content {
                 css: result.css.toString(),
                 files: result.stats.includedFiles
             };
-        } else {
-            return {
-                css: await FileUtils.readFile(this.paths.mainPath)
-            };
         }
+
+        return { css: await FileUtils.readFile(this.paths.mainPath) }
     }
 
     /**
diff --git a/client/src/structs/settings/setting.js b/client/src/structs/settings/setting.js
index fe2b4e5a..0967930f 100644
--- a/client/src/structs/settings/setting.js
+++ b/client/src/structs/settings/setting.js
@@ -47,7 +47,7 @@ export default class Setting {
         else if (args.type === 'kvp') return new KvpSetting(args, ...merge);
         else if (args.type === 'securekvp') return new SecureKvpSetting(args, ...merge);
         else if (args.type === 'custom') return new CustomSetting(args, ...merge);
-        else throw {message: `Setting type ${args.type} unknown`};
+        throw {message: `Setting type ${args.type} unknown`};
     }
 
 }
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index ac793dce..d7e6262b 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -197,7 +197,8 @@ export class WindowUtils extends Module {
         if (!nodeIntegration) return window.send('--bd-inject-script', {script: fpath, variable});
 
         if (variable) return window.executeJavaScript(`window["${escaped_variable}"] = require("${escaped_path}");`);
-        else return window.executeJavaScript(`require("${escaped_path}");`);
+
+        return window.executeJavaScript(`require("${escaped_path}");`);
     }
 
     on(event, callback) {