rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update built-in extensions to use fixed order in extensions menu

Browse Source
This commit is contained in:
Cohee
2024-06-24 22:15:08 +03:00
parent 508b685fdc
commit c8b9b62d8a
12 changed files with 36 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
public/css/extensions-panel.css
View File

@@ -97,114 +97,7 @@ input.extension_missing[type="checkbox"] {
flex-direction: column; flex-direction: column;
} }
/** LEFT COLUMN **/ /* Fixes order of settings for extensions */
/* Must be always on top */ .extension_container {
#extensions_settings>#assets_ui { display: contents;
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;
} }

23
public/index.html
View File

@@ -4334,8 +4334,31 @@
</div> </div>
</div> </div>
<div id="extensions_settings" class="flex1 wide50p"> <div id="extensions_settings" class="flex1 wide50p">
<div id="assets_container" class="extension_container"></div>
<div id="expressions_container" class="extension_container"></div>
<div id="sd_container" class="extension_container"></div>
<div id="tts_container" class="extension_container"></div>
<div id="stt_container" class="extension_container"></div>
<div id="audio_container" class="extension_container"></div>
<div id="silence_container" class="extension_container"></div>
<div id="objective_container" class="extension_container"></div>
<div id="blip_container" class="extension_container"></div>
<div id="live2d_container" class="extension_container"></div>
<div id="vrm_container" class="extension_container"></div>
<div id="timelines_container" class="extension_container"></div>
</div> </div>
<div id="extensions_settings2" class="flex1 wide50p"> <div id="extensions_settings2" class="flex1 wide50p">
<div id="websearch_container" class="extension_container"></div>
<div id="emulatorjs_container" class="extension_container"></div>
<div id="qr_container" class="extension_container"></div>
<div id="translation_container" class="extension_container"></div>
<div id="caption_container" class="extension_container"></div>
<div id="idle_container" class="extension_container"></div>
<div id="summarize_container" class="extension_container"></div>
<div id="hypebot_container" class="extension_container"></div>
<div id="regex_container" class="extension_container"></div>
<div id="vectors_container" class="extension_container"></div>
<div id="randomizer_container" class="extension_container"></div>
</div> </div>
<hr class="wide100p margin0"> <hr class="wide100p margin0">
<div class="alignitemscenter flex-container justifyCenter wide100p" style="justify-content: space-between;"> <div class="alignitemscenter flex-container justifyCenter wide100p" style="justify-content: space-between;">

2
public/scripts/extensions/assets/index.js
View File

@@ -440,7 +440,7 @@ jQuery(async () => {
}); });
windowHtml.find('#assets_filters').hide(); windowHtml.find('#assets_filters').hide();
$('#extensions_settings').append(windowHtml); $('#assets_container').append(windowHtml);
eventSource.on(event_types.OPEN_CHARACTER_LIBRARY, async (forceDefault) => { eventSource.on(event_types.OPEN_CHARACTER_LIBRARY, async (forceDefault) => {
openCharacterBrowser(forceDefault); openCharacterBrowser(forceDefault);

2
public/scripts/extensions/caption/index.js
View File

@@ -409,7 +409,7 @@ jQuery(async function () {
} }
async function addSettings() { async function addSettings() {
const html = await renderExtensionTemplateAsync('caption', 'settings'); const html = await renderExtensionTemplateAsync('caption', 'settings');
$('#extensions_settings2').append(html); $('#caption_container').append(html);
} }
await addSettings(); await addSettings();

2
public/scripts/extensions/expressions/index.js
View File

@@ -1929,7 +1929,7 @@ function migrateSettings() {
} }
async function addSettings() { async function addSettings() {
const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings'); const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings');
$('#extensions_settings').append(template); $('#expressions_container').append(template);
$('#expression_override_button').on('click', onClickExpressionOverrideButton); $('#expression_override_button').on('click', onClickExpressionOverrideButton);
$('#expressions_show_default').on('input', onExpressionsShowDefaultInput); $('#expressions_show_default').on('input', onExpressionsShowDefaultInput);
$('#expression_upload_pack_button').on('click', onClickExpressionUploadPackButton); $('#expression_upload_pack_button').on('click', onClickExpressionUploadPackButton);

2
public/scripts/extensions/memory/index.js
View File

@@ -900,7 +900,7 @@ function setupListeners() {
jQuery(async function () { jQuery(async function () {
async function addExtensionControls() { async function addExtensionControls() {
const settingsHtml = await renderExtensionTemplateAsync('memory', 'settings', { defaultSettings }); const settingsHtml = await renderExtensionTemplateAsync('memory', 'settings', { defaultSettings });
$('#extensions_settings2').append(settingsHtml); $('#summarize_container').append(settingsHtml);
setupListeners(); setupListeners();
$('#summaryExtensionPopoutButton').off('click').on('click', function (e) { $('#summaryExtensionPopoutButton').off('click').on('click', function (e) {
doPopout(e); doPopout(e);

2
public/scripts/extensions/quick-reply/index.js
View File

@@ -169,7 +169,7 @@ const init = async () => {
log('settings: ', settings); log('settings: ', settings);
manager = new SettingsUi(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 = new ButtonUi(settings);
buttons.show(); buttons.show();

2
public/scripts/extensions/regex/index.js
View File

@@ -470,7 +470,7 @@ jQuery(async () => {
} }
const settingsHtml = $(await renderExtensionTemplateAsync('regex', 'dropdown')); const settingsHtml = $(await renderExtensionTemplateAsync('regex', 'dropdown'));
$('#extensions_settings2').append(settingsHtml); $('#regex_container').append(settingsHtml);
$('#open_regex_editor').on('click', function () { $('#open_regex_editor').on('click', function () {
onRegexEditorOpenClick(false, false); onRegexEditorOpenClick(false, false);
}); });

2
public/scripts/extensions/stable-diffusion/index.js
View File

@@ -3392,7 +3392,7 @@ jQuery(async () => {
const template = await renderExtensionTemplateAsync('stable-diffusion', 'settings', defaultSettings); const template = await renderExtensionTemplateAsync('stable-diffusion', 'settings', defaultSettings);
$('#extensions_settings').append(template); $('#sd_container').append(template);
$('#sd_source').on('change', onSourceChange); $('#sd_source').on('change', onSourceChange);
$('#sd_scale').on('input', onScaleInput); $('#sd_scale').on('input', onScaleInput);
$('#sd_steps').on('input', onStepsInput); $('#sd_steps').on('input', onStepsInput);

2
public/scripts/extensions/translate/index.js
View File

@@ -572,7 +572,7 @@ jQuery(async () => {
const buttonHtml = await renderExtensionTemplateAsync('translate', 'buttons'); const buttonHtml = await renderExtensionTemplateAsync('translate', 'buttons');
$('#extensionsMenu').append(buttonHtml); $('#extensionsMenu').append(buttonHtml);
$('#extensions_settings2').append(html); $('#translation_container').append(html);
$('#translate_chat').on('click', onTranslateChatClick); $('#translate_chat').on('click', onTranslateChatClick);
$('#translate_input_message').on('click', onTranslateInputMessageClick); $('#translate_input_message').on('click', onTranslateInputMessageClick);
$('#translation_clear').on('click', onTranslationsClearClick); $('#translation_clear').on('click', onTranslationsClearClick);

2
public/scripts/extensions/tts/index.js
View File

@@ -1162,7 +1162,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
`; `;
$('#extensions_settings').append(settingsHtml); $('#tts_container').append(settingsHtml);
$('#tts_refresh').on('click', onRefreshClick); $('#tts_refresh').on('click', onRefreshClick);
$('#tts_enabled').on('click', onEnableClick); $('#tts_enabled').on('click', onEnableClick);
$('#tts_narrate_dialogues').on('click', onNarrateDialoguesClick); $('#tts_narrate_dialogues').on('click', onNarrateDialoguesClick);

2
public/scripts/extensions/vectors/index.js
View File

@@ -1279,7 +1279,7 @@ jQuery(async () => {
// Migrate from TensorFlow to Transformers // Migrate from TensorFlow to Transformers
settings.source = settings.source !== 'local' ? settings.source : 'transformers'; settings.source = settings.source !== 'local' ? settings.source : 'transformers';
const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings'); 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', () => { $('#vectors_enabled_chats').prop('checked', settings.enabled_chats).on('input', () => {
settings.enabled_chats = $('#vectors_enabled_chats').prop('checked'); settings.enabled_chats = $('#vectors_enabled_chats').prop('checked');
Object.assign(extension_settings.vectors, settings); Object.assign(extension_settings.vectors, settings);