From d0f8ea3d82795e1e66f002ed5e53cc2e1fe7e2f9 Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Fri, 26 Mar 2021 00:27:01 +0000
Subject: [PATCH] removed unnecessary code

---
 src/js/config.js           |  1 -
 src/js/theme-controller.js | 27 ++++++---------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/js/config.js b/src/js/config.js
index ce9494719..a2859184b 100644
--- a/src/js/config.js
+++ b/src/js/config.js
@@ -1182,7 +1182,6 @@ export function toggleCustomTheme(nosave) {
 export function setCustomThemeColors(colors, nosave) {
   if (colors !== undefined) {
     config.customThemeColors = colors;
-    ThemeController.setCustomColors(colors);
     // ThemeController.set("custom");
     // applyCustomThemeColors();
   }
diff --git a/src/js/theme-controller.js b/src/js/theme-controller.js
index 551fdfb38..a4ba84304 100644
--- a/src/js/theme-controller.js
+++ b/src/js/theme-controller.js
@@ -7,19 +7,7 @@ import { swapElements } from "./dom-util";
 
 let isPreviewingTheme = false;
 let randomTheme = null;
-//TODO remove current theme and customcolors once config is a module
-let currentTheme = "serika_dark";
-let customColors = [
-  "#323437",
-  "#e2b714",
-  "#e2b714",
-  "#646669",
-  "#d1d0c5",
-  "#ca4754",
-  "#7e2a33",
-  "#ca4754",
-  "#7e2a33",
-];
+
 export const colorVars = [
   "--bg-color",
   "--main-color",
@@ -99,7 +87,10 @@ export function apply(themeName) {
 
   if (themeName === "custom") {
     colorVars.forEach((e, index) => {
-      document.documentElement.style.setProperty(e, customColors[index]);
+      document.documentElement.style.setProperty(
+        e,
+        Config.customThemeColors[index]
+      );
     });
   }
 
@@ -124,22 +115,16 @@ export function preview(themeName) {
 }
 
 export function set(themeName) {
-  currentTheme = themeName;
   apply(themeName);
 }
 
 export function clearPreview() {
   if (isPreviewingTheme) {
     isPreviewingTheme = false;
-    apply(currentTheme);
+    apply(Config.theme);
   }
 }
 
-export function setCustomColors(colors) {
-  customColors = colors;
-}
-
-//TODO remove config once config is a module
 export function randomiseTheme() {
   var randomList;
   Misc.getThemesList().then((themes) => {