From c8b9b62d8a6abc186744349cf5d53f343e894a11 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Mon, 24 Jun 2024 22:15:08 +0300 Subject: [PATCH] Update built-in extensions to use fixed order in extensions menu --- public/css/extensions-panel.css | 113 +----------------- public/index.html | 23 ++++ public/scripts/extensions/assets/index.js | 2 +- public/scripts/extensions/caption/index.js | 2 +- .../scripts/extensions/expressions/index.js | 2 +- public/scripts/extensions/memory/index.js | 2 +- .../scripts/extensions/quick-reply/index.js | 2 +- public/scripts/extensions/regex/index.js | 2 +- .../extensions/stable-diffusion/index.js | 2 +- public/scripts/extensions/translate/index.js | 2 +- public/scripts/extensions/tts/index.js | 2 +- public/scripts/extensions/vectors/index.js | 2 +- 12 files changed, 36 insertions(+), 120 deletions(-) diff --git a/public/css/extensions-panel.css b/public/css/extensions-panel.css index 3b22ddf23..d0c011e73 100644 --- a/public/css/extensions-panel.css +++ b/public/css/extensions-panel.css @@ -97,114 +97,7 @@ input.extension_missing[type="checkbox"] { flex-direction: column; } -/** LEFT COLUMN **/ -/* Must be always on top */ -#extensions_settings>#assets_ui { - order: -1; -} - -#extensions_settings>.expression_settings { - order: 2; -} - -#extensions_settings>.background_settings { - order: 3; -} - -#extensions_settings>.sd_settings { - order: 4; -} - -#extensions_settings>#tts_settings { - order: 5; -} - -#extensions_settings>#rvc_settings { - order: 6; -} - -#extensions_settings>.objective-settings { - order: 7; -} - -#extensions_settings>#speech_recognition_settings { - order: 8; -} - -#extensions_settings>#audio_settings { - order: 9; -} - -/** RIGHT COLUMN **/ -#extensions_settings2>.translation_settings { - order: 1; -} - -#extensions_settings2>.caption_settings { - order: 2; -} - -#extensions_settings2>.quickReplySettings { - order: 3; -} - -#extensions_settings2>.idle-settings { - order: 4; -} - -#extensions_settings2>#memory_settings { - order: 5; -} - -#extensions_settings2>.hypebot_settings { - order: 6; -} - -#extensions_settings2>.regex_settings { - order: 7; -} - -#extensions_settings2>.vectors_settings { - order: 8; -} - -#extensions_settings2>.chromadb_settings { - order: 9; -} - -#extensions_settings2>.randomizer_settings { - order: 10; -} - -/** WAND MENU **/ -#extensionsMenu>#ttsExtensionMenuItem { - order: 1; -} - -#extensionsMenu>#sd_gen { - order: 2; -} - -#extensionsMenu>#send_picture { - order: 3; -} - -#extensionsMenu>#token_counter { - order: 4; -} - -#extensionsMenu>#objective-task-manual-check-menu-item { - order: 5; -} - -#extensionsMenu>#roll_dice { - order: 6; -} - -#extensionsMenu>#translate_chat { - order: 7; -} - -#extensionsMenu>#translate_input_message { - order: 8; +/* Fixes order of settings for extensions */ +.extension_container { + display: contents; } diff --git a/public/index.html b/public/index.html index fcf7687d0..ffdebee2b 100644 --- a/public/index.html +++ b/public/index.html @@ -4334,8 +4334,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/scripts/extensions/assets/index.js b/public/scripts/extensions/assets/index.js index 2d96fa875..80490d283 100644 --- a/public/scripts/extensions/assets/index.js +++ b/public/scripts/extensions/assets/index.js @@ -440,7 +440,7 @@ jQuery(async () => { }); windowHtml.find('#assets_filters').hide(); - $('#extensions_settings').append(windowHtml); + $('#assets_container').append(windowHtml); eventSource.on(event_types.OPEN_CHARACTER_LIBRARY, async (forceDefault) => { openCharacterBrowser(forceDefault); diff --git a/public/scripts/extensions/caption/index.js b/public/scripts/extensions/caption/index.js index 8e8595698..68119f08f 100644 --- a/public/scripts/extensions/caption/index.js +++ b/public/scripts/extensions/caption/index.js @@ -409,7 +409,7 @@ jQuery(async function () { } async function addSettings() { const html = await renderExtensionTemplateAsync('caption', 'settings'); - $('#extensions_settings2').append(html); + $('#caption_container').append(html); } await addSettings(); diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js index 98615b6d8..3a8afdba0 100644 --- a/public/scripts/extensions/expressions/index.js +++ b/public/scripts/extensions/expressions/index.js @@ -1929,7 +1929,7 @@ function migrateSettings() { } async function addSettings() { const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings'); - $('#extensions_settings').append(template); + $('#expressions_container').append(template); $('#expression_override_button').on('click', onClickExpressionOverrideButton); $('#expressions_show_default').on('input', onExpressionsShowDefaultInput); $('#expression_upload_pack_button').on('click', onClickExpressionUploadPackButton); diff --git a/public/scripts/extensions/memory/index.js b/public/scripts/extensions/memory/index.js index 5d61417e3..34b3caeb2 100644 --- a/public/scripts/extensions/memory/index.js +++ b/public/scripts/extensions/memory/index.js @@ -900,7 +900,7 @@ function setupListeners() { jQuery(async function () { async function addExtensionControls() { const settingsHtml = await renderExtensionTemplateAsync('memory', 'settings', { defaultSettings }); - $('#extensions_settings2').append(settingsHtml); + $('#summarize_container').append(settingsHtml); setupListeners(); $('#summaryExtensionPopoutButton').off('click').on('click', function (e) { doPopout(e); diff --git a/public/scripts/extensions/quick-reply/index.js b/public/scripts/extensions/quick-reply/index.js index 019a8cec3..df2a1454c 100644 --- a/public/scripts/extensions/quick-reply/index.js +++ b/public/scripts/extensions/quick-reply/index.js @@ -169,7 +169,7 @@ const init = async () => { log('settings: ', settings); manager = new SettingsUi(settings); - document.querySelector('#extensions_settings2').append(await manager.render()); + document.querySelector('#qr_container').append(await manager.render()); buttons = new ButtonUi(settings); buttons.show(); diff --git a/public/scripts/extensions/regex/index.js b/public/scripts/extensions/regex/index.js index 7108b9315..72ce4a7fe 100644 --- a/public/scripts/extensions/regex/index.js +++ b/public/scripts/extensions/regex/index.js @@ -470,7 +470,7 @@ jQuery(async () => { } const settingsHtml = $(await renderExtensionTemplateAsync('regex', 'dropdown')); - $('#extensions_settings2').append(settingsHtml); + $('#regex_container').append(settingsHtml); $('#open_regex_editor').on('click', function () { onRegexEditorOpenClick(false, false); }); diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js index 2a759ac99..f429cdd49 100644 --- a/public/scripts/extensions/stable-diffusion/index.js +++ b/public/scripts/extensions/stable-diffusion/index.js @@ -3392,7 +3392,7 @@ jQuery(async () => { const template = await renderExtensionTemplateAsync('stable-diffusion', 'settings', defaultSettings); - $('#extensions_settings').append(template); + $('#sd_container').append(template); $('#sd_source').on('change', onSourceChange); $('#sd_scale').on('input', onScaleInput); $('#sd_steps').on('input', onStepsInput); diff --git a/public/scripts/extensions/translate/index.js b/public/scripts/extensions/translate/index.js index a27efb011..c599565a9 100644 --- a/public/scripts/extensions/translate/index.js +++ b/public/scripts/extensions/translate/index.js @@ -572,7 +572,7 @@ jQuery(async () => { const buttonHtml = await renderExtensionTemplateAsync('translate', 'buttons'); $('#extensionsMenu').append(buttonHtml); - $('#extensions_settings2').append(html); + $('#translation_container').append(html); $('#translate_chat').on('click', onTranslateChatClick); $('#translate_input_message').on('click', onTranslateInputMessageClick); $('#translation_clear').on('click', onTranslationsClearClick); diff --git a/public/scripts/extensions/tts/index.js b/public/scripts/extensions/tts/index.js index da0d860b1..c60d93053 100644 --- a/public/scripts/extensions/tts/index.js +++ b/public/scripts/extensions/tts/index.js @@ -1162,7 +1162,7 @@ $(document).ready(function () {
`; - $('#extensions_settings').append(settingsHtml); + $('#tts_container').append(settingsHtml); $('#tts_refresh').on('click', onRefreshClick); $('#tts_enabled').on('click', onEnableClick); $('#tts_narrate_dialogues').on('click', onNarrateDialoguesClick); diff --git a/public/scripts/extensions/vectors/index.js b/public/scripts/extensions/vectors/index.js index fc5fd8813..c27578a95 100644 --- a/public/scripts/extensions/vectors/index.js +++ b/public/scripts/extensions/vectors/index.js @@ -1279,7 +1279,7 @@ jQuery(async () => { // Migrate from TensorFlow to Transformers settings.source = settings.source !== 'local' ? settings.source : 'transformers'; const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings'); - $('#extensions_settings2').append(template); + $('#vectors_container').append(template); $('#vectors_enabled_chats').prop('checked', settings.enabled_chats).on('input', () => { settings.enabled_chats = $('#vectors_enabled_chats').prop('checked'); Object.assign(extension_settings.vectors, settings);