From 8ed3a9e1a88656f8d93a3d29ad6182cc9c2b9694 Mon Sep 17 00:00:00 2001 From: Otard95 Date: Thu, 3 Jun 2021 21:34:06 +0200 Subject: [PATCH] Remove monkey power level from settings, add and rename levels --- src/js/config.js | 23 +++++++++-------------- src/js/settings.js | 4 ---- static/index.html | 41 ----------------------------------------- 3 files changed, 9 insertions(+), 59 deletions(-) diff --git a/src/js/config.js b/src/js/config.js index ff9f31ce6..996f8bfac 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -16,7 +16,6 @@ import * as PaceCaret from "./pace-caret"; import * as UI from "./ui"; import * as CommandlineLists from "./commandline-lists"; import * as BackgroundFilter from "./custom-background-filter"; -import * as Settings from "./settings"; import LayoutList from "./layouts"; export let localStorageConfig = null; @@ -123,7 +122,7 @@ let defaultConfig = { customBackgroundFilter: [0, 1, 1, 1, 1], customLayoutfluid: "qwerty#dvorak#colemak", monkeyPowerUnlocked: false, - monkeyPowerLevel: 9001, + monkeyPowerLevel: ">9000", }; function isConfigKeyValid(name) { @@ -1486,21 +1485,17 @@ export function setCustomBackgroundFilter(array, nosave) { if (!nosave) saveToLocalStorage(); } -export function setMonkeyPowerUnlocked(val, nosave) { - if (val !== true) val = false; - config.monkeyPowerUnlocked = val; - - if (val) setMonkeyPowerLevel(9001); - Settings.groups.monkeyPowerLevel?.updateButton(); - $(".section.monkeyPowerLevel")[val ? "removeClass" : "addClass"]("hidden"); - +export function setMonkeyPowerLevel(level, nosave) { + if (!["off", "mellow", "high", "ultra", ">9000"].includes(level)) + level = "off"; + config.monkeyPowerLevel = level; if (!nosave) saveToLocalStorage(); } -export function setMonkeyPowerLevel(level, nosave) { - level = parseInt(level); - if (![1, 2, 9001].includes(level)) level = 0; - config.monkeyPowerLevel = level; +export function setMonkeyPowerUnlocked(val, nosave) { + if (val !== true) val = false; + config.monkeyPowerUnlocked = val; + if (val) setMonkeyPowerLevel(">9000"); if (!nosave) saveToLocalStorage(); } diff --git a/src/js/settings.js b/src/js/settings.js index 5bd90be97..b3c696319 100644 --- a/src/js/settings.js +++ b/src/js/settings.js @@ -287,10 +287,6 @@ async function initGroups() { // "customLayoutfluid", // UpdateConfig.setCustomLayoutfluid // ); - groups.monkeyPowerLevel = new SettingsGroup( - "monkeyPowerLevel", - UpdateConfig.setMonkeyPowerLevel - ); } async function fillSettingsPage() { diff --git a/static/index.html b/static/index.html index 87d3ff395..280fea4e7 100644 --- a/static/index.html +++ b/static/index.html @@ -3210,47 +3210,6 @@

keymap layout

-