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

Fix old name prepopulate, run formatter

Browse Source
This commit is contained in:
Cohee
2024-10-09 01:29:23 +03:00
parent 4b0d342e8b
commit 7061753d84
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
public/scripts/preset-manager.js
View File

@@ -329,7 +329,7 @@ class PresetManager {
* @returns {any} Preset value * @returns {any} Preset value
*/ */
findPreset(name) { findPreset(name) {
return $(this.select).find('option').filter(function() { return $(this.select).find('option').filter(function () {
return $(this).text() === name; return $(this).text() === name;
}).val(); }).val();
} }
@@ -355,7 +355,7 @@ class PresetManager {
* @param {string} value Preset option value * @param {string} value Preset option value
*/ */
selectPreset(value) { selectPreset(value) {
const option = $(this.select).filter(function() { const option = $(this.select).filter(function () {
return $(this).val() === value; return $(this).val() === value;
}); });
option.prop('selected', true); option.prop('selected', true);
@@ -422,7 +422,7 @@ class PresetManager {
this.updateList(name, preset); this.updateList(name, preset);
} }
async renamePreset(newName) { async renamePreset(newName) {
const oldName = this.getSelectedPresetName(); const oldName = this.getSelectedPresetName();
try { try {
@@ -619,10 +619,10 @@ class PresetManager {
} else { } else {
delete preset_names[nameToDelete]; delete preset_names[nameToDelete];
} }
// switch in UI only when deleting currently selected preset // switch in UI only when deleting currently selected preset
const switchPresets = !name || this.getSelectedPresetName() == name; const switchPresets = !name || this.getSelectedPresetName() == name;
if (Object.keys(preset_names).length && switchPresets) { if (Object.keys(preset_names).length && switchPresets) {
const nextPresetName = Object.keys(preset_names)[0]; const nextPresetName = Object.keys(preset_names)[0];
const newValue = preset_names[nextPresetName]; const newValue = preset_names[nextPresetName];
@@ -739,7 +739,8 @@ async function waitForConnection() {
export async function initPresetManager() { export async function initPresetManager() {
eventSource.on(event_types.CHAT_CHANGED, autoSelectPreset); eventSource.on(event_types.CHAT_CHANGED, autoSelectPreset);
registerPresetManagers(); registerPresetManagers();
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'preset', SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'preset',
callback: presetCommandCallback, callback: presetCommandCallback,
returns: 'current preset', returns: 'current preset',
unnamedArgumentList: [ unnamedArgumentList: [
@@ -791,7 +792,7 @@ export async function initPresetManager() {
await presetManager.savePresetAs(); await presetManager.savePresetAs();
}); });
$(document).on('click', '[data-preset-manager-rename]', async function () { $(document).on('click', '[data-preset-manager-rename]', async function () {
const apiId = $(this).data('preset-manager-rename'); const apiId = $(this).data('preset-manager-rename');
const presetManager = getPresetManager(apiId); const presetManager = getPresetManager(apiId);
@@ -800,17 +801,17 @@ export async function initPresetManager() {
console.warn(`Preset Manager not found for API: ${apiId}`); console.warn(`Preset Manager not found for API: ${apiId}`);
return; return;
} }
const popupHeader = !presetManager.isAdvancedFormatting() ? t`Rename preset` : t`Rename template`; const popupHeader = !presetManager.isAdvancedFormatting() ? t`Rename preset` : t`Rename template`;
const oldName = name; const oldName = presetManager.getSelectedPresetName();
const newName = await Popup.show.input(popupHeader, t`Enter a new name:`, oldName); const newName = await Popup.show.input(popupHeader, t`Enter a new name:`, oldName);
if (oldName === newName || !newName) { if (!newName || oldName === newName) {
console.debug(!presetManager.isAdvancedFormatting() ? 'Preset rename cancelled' : 'Template rename cancelled'); console.debug(!presetManager.isAdvancedFormatting() ? 'Preset rename cancelled' : 'Template rename cancelled');
return; return;
} }
await presetManager.renamePreset(newName); await presetManager.renamePreset(newName);
const successToast = !presetManager.isAdvancedFormatting() ? t`Preset renamed` : t`Template renamed`; const successToast = !presetManager.isAdvancedFormatting() ? t`Preset renamed` : t`Template renamed`;
toastr.success(successToast); toastr.success(successToast);
}); });