From 356c0c95f649d61c8e983560b51736980d50362f Mon Sep 17 00:00:00 2001 From: somebody Date: Tue, 6 Sep 2022 21:09:10 -0500 Subject: [PATCH 1/4] Dont change color on pin Due to the limited color palette Gruvbox Dark offers, it's very visually weird for things to have such similar colors --- themes/Gruvbox Dark.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/Gruvbox Dark.css b/themes/Gruvbox Dark.css index 9c49cadc..73e44de0 100644 --- a/themes/Gruvbox Dark.css +++ b/themes/Gruvbox Dark.css @@ -110,7 +110,7 @@ /* Side Menus */ --tab_color: var(--gruvbox-dark2); - --flyout_background: var(--layer1_palette); + --flyout_background: var(--gruvbox-dark0-soft); --flyout_background_pinned: var(--gruvbox-dark0-soft); --setting_background: var(--gruvbox-dark1); From e890b7e2263d6c32f486f04281431d58b2af1092 Mon Sep 17 00:00:00 2001 From: somebody Date: Wed, 7 Sep 2022 16:47:47 -0500 Subject: [PATCH 2/4] Add on_colab global variable --- static/koboldai.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/static/koboldai.js b/static/koboldai.js index 353fa440..fb44e69e 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -42,6 +42,7 @@ var world_info_data = {}; var world_info_folder_data = {}; var saved_settings = {}; var finder_selection_index = -1; +var on_colab; // name, desc, icon, func const finder_actions = [ @@ -3357,6 +3358,8 @@ function open_finder() { } $(document).ready(function(){ + on_colab = document.getElementById("on_colab").textContent == "true"; + create_theming_elements(); document.onkeydown = detect_key_down; document.onkeyup = detect_key_up; From 9f370aa893a120c5a5a58bcfc53d465d18b3e8a7 Mon Sep 17 00:00:00 2001 From: somebody Date: Wed, 7 Sep 2022 16:48:42 -0500 Subject: [PATCH 3/4] Remove unused variable --- static/koboldai.js | 1 - 1 file changed, 1 deletion(-) diff --git a/static/koboldai.js b/static/koboldai.js index fb44e69e..28098d0d 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -3497,7 +3497,6 @@ $(document).ready(function(){ const finderContainer = document.getElementById("finder-container"); const finderInput = document.getElementById("finder-input"); const finder = document.getElementById("finder"); - let lastInput; finderInput.addEventListener("keyup", updateSearchListings); finderInput.addEventListener("keydown", function(event) { From 1c101b15ba2370bd8e67a1358931d6e680f5b9cb Mon Sep 17 00:00:00 2001 From: somebody Date: Wed, 7 Sep 2022 16:49:20 -0500 Subject: [PATCH 4/4] Make load_tweaks work and such --- static/koboldai.js | 52 +++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/static/koboldai.js b/static/koboldai.js index 28098d0d..2ce5e3d9 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -2017,8 +2017,31 @@ function send_world_info(uid) { socket.emit("edit_world_info", world_info_data[uid]); } +function save_tweaks() { + let out = []; + + for (const tweakContainer of document.getElementsByClassName("tweak-container")) { + let toggle = tweakContainer.querySelector("input"); + let path = tweakContainer.getAttribute("tweak-path"); + if (toggle.checked) out.push(path); + } + + if (on_colab) { + socket.emit("save_tweaks", JSON.stringify(out)); + } else { + setCookie("enabledTweaks", JSON.stringify(out)); + } +} + + function load_tweaks(data) { - + let enabledTweaks = JSON.parse(data); + + for (const tweakContainer of document.getElementsByClassName("tweak-container")) { + let toggle = tweakContainer.querySelector("input"); + let path = tweakContainer.getAttribute("tweak-path"); + if (enabledTweaks.includes(path)) $(toggle).bootstrapToggle("on"); + } } function toggle_adventure_mode(button) { @@ -3379,28 +3402,8 @@ $(document).ready(function(){ // Tweak registering - let enabledTweaks = JSON.parse(getCookie("enabledTweaks", "[]")); - - function saveTweaks() { - let out = []; - - // TODO: Better saving - for (const tweakContainer of document.getElementsByClassName("tweak-container")) { - let toggle = tweakContainer.querySelector("input"); - let path = tweakContainer.getAttribute("tweak-path"); - if (toggle.checked) out.push(path); - } - - setCookie("enabledTweaks", JSON.stringify(out)); - if (document.getElementById("on_colab").textContent == "true") { - socket.emit("save_tweaks", JSON.stringify(out)); - } - } - - for (const tweakContainer of document.getElementsByClassName("tweak-container")) { let toggle = tweakContainer.querySelector("input"); - let path = tweakContainer.getAttribute("tweak-path"); $(toggle).change(function(e) { let path = $(this).closest(".tweak-container")[0].getAttribute("tweak-path"); @@ -3417,12 +3420,13 @@ $(document).ready(function(){ if (el) el.remove(); } - saveTweaks(); + save_tweaks(); }); - - if (enabledTweaks.includes(path)) $(toggle).bootstrapToggle("on"); } + // Load tweaks from cookies if not on Colab; Colab uses the server for persistant storage. + if (!on_colab) load_tweaks(getCookie("enabledTweaks", "[]")); + $("#context-viewer-close").click(function() { document.getElementById("context-viewer-container").classList.add("hidden"); });