From 890ae4bba93e9f6c3d90d6eff74926a60c27bf21 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Sat, 4 Nov 2023 17:44:43 +0200 Subject: [PATCH] Optimize WI layout --- public/css/world-info.css | 2 +- public/index.html | 288 ++++++++++++++++++----------------- public/scripts/world-info.js | 35 ++--- 3 files changed, 162 insertions(+), 163 deletions(-) diff --git a/public/css/world-info.css b/public/css/world-info.css index 5d6a516db..5ae24fa32 100644 --- a/public/css/world-info.css +++ b/public/css/world-info.css @@ -190,4 +190,4 @@ .WIEntryHeaderTitleMobile { display: none; -} \ No newline at end of file +} diff --git a/public/index.html b/public/index.html index fdde3f912..a9a9855d5 100644 --- a/public/index.html +++ b/public/index.html @@ -1329,7 +1329,7 @@ - +
Keep # Best Responses @@ -2510,152 +2510,154 @@
-
-
-
- Active World(s) for all chats -
-
- -
+
+
+ Active World(s) for all chats
-
-
-
-
+ + +
+
+ Activation Settings +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+ Scan Depth +
+
+
+ +
+
+ + +
+
+
+ +
+
+ Context % +
+
+
+ +
+
+ +
+
+
+ +
+
+ Budget Cap +
+
+
+ +
+
+ +
+
+
+ (0 = disabled) +
+
+ + +
+
+ Min Activations +
+
+
+ +
+
+ +
+
+
+
+
+ Max Depth +
+
+
+ +
+
+ + +
+
+
+ (0 = unlimited, use budget) +
+
+ + +
+
+ +
+ + + +
-
- -
-
- -
-
-
- Scan Depth -
-
-
- -
-
- - -
-
-
- -
-
- Context % -
-
-
- -
-
- - -
-
-
- -
-
- Budget Cap -
-
-
- -
-
- - -
-
-
- (0 = disabled) -
-
- - -
-
- Min Activations -
-
-
- -
-
- - -
-
-
- scan chronologically until min entries or token budget -
-
-
-
- Min Activations: Max Depth -
-
-
- -
-
- - -
-
-
- (0 = chronological scan depth unlimited, use token budget) -
-
- -
- -
- - - - -
- -
@@ -5045,4 +5047,4 @@ - \ No newline at end of file + diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js index 5ac9144c9..72e3c7836 100644 --- a/public/scripts/world-info.js +++ b/public/scripts/world-info.js @@ -60,8 +60,6 @@ const worldInfoFilter = new FilterHelper(() => updateEditor()); const SORT_ORDER_KEY = 'world_info_sort_order'; const METADATA_KEY = 'world_info'; -const InputWidthReference = $("#WIInputWidthReference"); - const DEFAULT_DEPTH = 4; export function getWorldInfoSettings() { @@ -384,22 +382,21 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) { Title/Memo - + Status - + Position - + Depth - + Order - + Trigger % -
` const blocks = page.map(entry => getWorldEntry(name, data, entry)); $("#world_popup_entries_list").append(keywordHeaders); @@ -836,7 +833,7 @@ function getWorldEntry(name, data, entry) { saveWorldInfo(name, data); }); orderInput.val(entry.order).trigger("input"); - orderInput.width(InputWidthReference.width() + 15 + 'px') + orderInput.css('width', 'calc(3em + 15px)'); // probability if (entry.probability === undefined) { @@ -857,7 +854,7 @@ function getWorldEntry(name, data, entry) { saveWorldInfo(name, data); }); depthInput.val(entry.depth ?? DEFAULT_DEPTH).trigger("input"); - depthInput.width(InputWidthReference.width() + 15 + 'px'); + depthInput.css('width', 'calc(3em + 15px)'); // Hide by default unless depth is specified if (entry.position === world_info_position.atDepth) { @@ -885,7 +882,7 @@ function getWorldEntry(name, data, entry) { saveWorldInfo(name, data); }); probabilityInput.val(entry.probability).trigger("input"); - probabilityInput.width(InputWidthReference.width() + 15 + 'px') + probabilityInput.css('width', 'calc(3em + 15px)'); // probability toggle if (entry.useProbability === undefined) { @@ -2065,7 +2062,7 @@ jQuery(() => { $("#world_editor_select").on('change', async () => { $("#world_info_search").val(''); worldInfoFilter.setFilterData(FILTER_TYPES.WORLD_INFO_SEARCH, '', true); - const selectedIndex = $("#world_editor_select").find(":selected").val(); + const selectedIndex = String($("#world_editor_select").find(":selected").val()); if (selectedIndex === "") { hideWorldEditor(); @@ -2080,39 +2077,39 @@ jQuery(() => { eventSource.emit(event_types.WORLDINFO_SETTINGS_UPDATED); } - $(document).on("input", "#world_info_depth", function () { + $("#world_info_depth").on('input', function () { world_info_depth = Number($(this).val()); $("#world_info_depth_counter").val($(this).val()); saveSettings(); }); - $(document).on("input", "#world_info_min_activations", function () { + $("#world_info_min_activations").on('input', function () { world_info_min_activations = Number($(this).val()); $("#world_info_min_activations_counter").val($(this).val()); saveSettings(); }); - $(document).on("input", "#world_info_min_activations_depth_max", function () { + $("#world_info_min_activations_depth_max").on('input', function () { world_info_min_activations_depth_max = Number($(this).val()); $("#world_info_min_activations_depth_max_counter").val($(this).val()); saveSettings(); }); - $(document).on("input", "#world_info_budget", function () { + $("#world_info_budget").on('input', function () { world_info_budget = Number($(this).val()); $("#world_info_budget_counter").val($(this).val()); saveSettings(); }); - $(document).on("input", "#world_info_recursive", function () { + $("#world_info_recursive").on('input', function () { world_info_recursive = !!$(this).prop('checked'); saveSettings(); - }) + }); $('#world_info_case_sensitive').on('input', function () { world_info_case_sensitive = !!$(this).prop('checked'); saveSettings(); - }) + }); $('#world_info_match_whole_words').on('input', function () { world_info_match_whole_words = !!$(this).prop('checked');