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

Don't auto-switch to a new theme on import

Browse Source
This commit is contained in:
Cohee
2024-06-18 02:14:22 +03:00
parent 22d598c0f5
commit e861a406a3
1 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
public/scripts/power-user.js
View File

@ -2262,22 +2262,23 @@ async function importTheme(file) {
} }
themes.push(parsed); themes.push(parsed);
await applyTheme(parsed.name); await saveTheme(parsed.name, getNewTheme(parsed));
await saveTheme(parsed.name);
const option = document.createElement('option'); const option = document.createElement('option');
option.selected = true; option.selected = false;
option.value = parsed.name; option.value = parsed.name;
option.innerText = parsed.name; option.innerText = parsed.name;
$('#themes').append(option); $('#themes').append(option);
saveSettingsDebounced(); saveSettingsDebounced();
toastr.success(parsed.name, 'Theme imported');
} }
/** /**
* Saves the current theme to the server. * Saves the current theme to the server.
* @param {string|undefined} name Theme name. If undefined, a popup will be shown to enter a name. * @param {string|undefined} name Theme name. If undefined, a popup will be shown to enter a name.
* @param {object|undefined} theme Theme object. If undefined, the current theme will be saved.
* @returns {Promise<object>} A promise that resolves when the theme is saved. * @returns {Promise<object>} A promise that resolves when the theme is saved.
*/ */
async function saveTheme(name = undefined) { async function saveTheme(name = undefined, theme = undefined) {
if (typeof name !== 'string') { if (typeof name !== 'string') {
name = await callPopup('Enter a theme preset name:', 'input', power_user.theme); name = await callPopup('Enter a theme preset name:', 'input', power_user.theme);
@ -2286,7 +2287,46 @@ async function saveTheme(name = undefined) {
} }
} }
const theme = { if (typeof theme !== 'object') {
theme = getThemeObject(name);
}
const response = await fetch('/api/themes/save', {
method: 'POST',
headers: getRequestHeaders(),
body: JSON.stringify(theme),
});
if (response.ok) {
const themeIndex = themes.findIndex(x => x.name == name);
if (themeIndex == -1) {
themes.push(theme);
const option = document.createElement('option');
option.selected = true;
option.value = name;
option.innerText = name;
$('#themes').append(option);
}
else {
themes[themeIndex] = theme;
$(`#themes option[value="${name}"]`).attr('selected', true);
}
power_user.theme = name;
saveSettingsDebounced();
}
return theme;
}
/**
* Gets a snapshot of the current theme settings.
* @param {string} name Name of the theme
* @returns {object} Theme object
*/
function getThemeObject(name) {
return {
name, name,
blur_strength: power_user.blur_strength, blur_strength: power_user.blur_strength,
main_text_color: power_user.main_text_color, main_text_color: power_user.main_text_color,
@ -2324,33 +2364,20 @@ async function saveTheme(name = undefined) {
reduced_motion: power_user.reduced_motion, reduced_motion: power_user.reduced_motion,
compact_input_area: power_user.compact_input_area, compact_input_area: power_user.compact_input_area,
}; };
}
const response = await fetch('/api/themes/save', { /**
method: 'POST', * Applies imported theme properties to the theme object.
headers: getRequestHeaders(), * @param {object} parsed Parsed object to get the theme from.
body: JSON.stringify(theme), * @returns {object} Theme assigned to the parsed object.
}); */
function getNewTheme(parsed) {
if (response.ok) { const theme = getThemeObject(parsed.name);
const themeIndex = themes.findIndex(x => x.name == name); for (const key in parsed) {
if (Object.hasOwn(theme, key)) {
if (themeIndex == -1) { theme[key] = parsed[key];
themes.push(theme);
const option = document.createElement('option');
option.selected = true;
option.value = name;
option.innerText = name;
$('#themes').append(option);
} }
else {
themes[themeIndex] = theme;
$(`#themes option[value="${name}"]`).attr('selected', true);
}
power_user.theme = name;
saveSettingsDebounced();
} }
return theme; return theme;
} }