Use saved settings for more properties

87ff99709f9f02f10fe21aadaee6359969ceecbb

d-ber <davide.bertalero@studenti.unimi.it>

Parents: d153991a11c42b976a13e13b06f1b7d2280bea7a
1 files changed, +8 -88Ignore whitespace
public/scripts/power-user.js+8 -88
@@ -302,8 +302,6 @@ export let context_presets = [];
302302
303303const storage_keys = {
304304 chat_display: 'TavernAI_chat_display',
305- chat_width: 'chat_width',
306- font_scale: 'TavernAI_font_scale',
307305
308306 main_text_color: 'TavernAI_main_text_color',
309307 italics_text_color: 'TavernAI_italics_text_color',
@@ -313,7 +311,6 @@ const storage_keys = {
313311 chat_tint_color: 'TavernAI_chat_tint_color',
314312 user_mes_blur_tint_color: 'TavernAI_user_mes_blur_tint_color',
315313 bot_mes_blur_tint_color: 'TavernAI_bot_mes_blur_tint_color',
316- blur_strength: 'TavernAI_blur_strength',
317314 shadow_color: 'TavernAI_shadow_color',
318315 shadow_width: 'TavernAI_shadow_width',
319316 border_color: 'TavernAI_border_color',
@@ -321,17 +318,9 @@ const storage_keys = {
321318 custom_css: 'TavernAI_custom_css',
322319
323320 waifuMode: 'TavernAI_waifuMode',
324- movingUI: 'TavernAI_movingUI',
325321
326- timer_enabled: 'TimerEnabled',
327- timestamps_enabled: 'TimestampsEnabled',
328322 timestamp_model_icon: 'TimestampModelIcon',
329- mesIDDisplay_enabled: 'mesIDDisplayEnabled',
330- hideChatAvatars_enabled: 'hideChatAvatarsEnabled',
331323 message_token_count_enabled: 'MessageTokenCountEnabled',
332- expand_message_actions: 'ExpandMessageActions',
333- enableZenSliders: 'enableZenSliders',
334- enableLabMode: 'enableLabMode',
335324 reduced_motion: 'reduced_motion',
336325 compact_input_area: 'compact_input_area',
337326 auto_connect_legacy: 'AutoConnectEnabled',
@@ -460,15 +449,11 @@ function switchHotswap() {
460449}
461450
462451function switchTimer() {
463- const value = localStorage.getItem(storage_keys.timer_enabled);
464- power_user.timer_enabled = value === null ? true : value == 'true';
465452 $('body').toggleClass('no-timer', !power_user.timer_enabled);
466453 $('#messageTimerEnabled').prop('checked', power_user.timer_enabled);
467454}
468455
469456function switchTimestamps() {
470- const value = localStorage.getItem(storage_keys.timestamps_enabled);
471- power_user.timestamps_enabled = value === null ? true : value == 'true';
472457 $('body').toggleClass('no-timestamps', !power_user.timestamps_enabled);
473458 $('#messageTimestampsEnabled').prop('checked', power_user.timestamps_enabled);
474459}
@@ -488,30 +473,16 @@ function switchTokenCount() {
488473}
489474
490475function switchMesIDDisplay() {
491- const value = localStorage.getItem(storage_keys.mesIDDisplay_enabled);
492- power_user.mesIDDisplay_enabled = value === null ? true : value == 'true';
493- /* console.log(`
494- localstorage value:${value},
495- poweruser before:${before},
496- poweruser after:${power_user.mesIDDisplay_enabled}`) */
497476 $('body').toggleClass('no-mesIDDisplay', !power_user.mesIDDisplay_enabled);
498477 $('#mesIDDisplayEnabled').prop('checked', power_user.mesIDDisplay_enabled);
499478}
500479
501480function switchHideChatAvatars() {
502- const value = localStorage.getItem(storage_keys.hideChatAvatars_enabled);
503- power_user.hideChatAvatars_enabled = value === null ? false : value == 'true';
504- /*console.log(`
505- localstorage value:${value},
506- poweruser after:${power_user.hideChatAvatars_enabled}`)
507- */
508481 $('body').toggleClass('hideChatAvatars', power_user.hideChatAvatars_enabled);
509482 $('#hideChatAvatarsEnabled').prop('checked', power_user.hideChatAvatars_enabled);
510483}
511484
512485function switchMessageActions() {
513- const value = localStorage.getItem(storage_keys.expand_message_actions);
514- power_user.expand_message_actions = value === null ? false : value == 'true';
515486 $('body').toggleClass('expandMessageActions', power_user.expand_message_actions);
516487 $('#expandMessageActions').prop('checked', power_user.expand_message_actions);
517488 $('.extraMesButtons, .extraMesButtonsHint').removeAttr('style');
@@ -545,8 +516,6 @@ async function switchLabMode() {
545516 }
546517 */
547518 await delay(100);
548- const value = localStorage.getItem(storage_keys.enableLabMode);
549- power_user.enableLabMode = value === null ? false : value == 'true';
550519 $('body').toggleClass('enableLabMode', power_user.enableLabMode);
551520 $('#enableLabMode').prop('checked', power_user.enableLabMode);
552521
@@ -593,8 +562,6 @@ async function switchLabMode() {
593562
594563async function switchZenSliders() {
595564 await delay(100);
596- const value = localStorage.getItem(storage_keys.enableZenSliders);
597- power_user.enableZenSliders = value === null ? false : value == 'true';
598565 $('body').toggleClass('enableZenSliders', power_user.enableZenSliders);
599566 $('#enableZenSliders').prop('checked', power_user.enableZenSliders);
600567
@@ -1015,8 +982,6 @@ function switchMovingUI() {
1015982 $('.drawer-content.maximized').each(function () {
1016983 $(this).find('.inline-drawer-maximize').trigger('click');
1017984 });
1018- const movingUI = localStorage.getItem(storage_keys.movingUI);
1019- power_user.movingUI = movingUI === null ? false : movingUI == 'true';
1020985 $('body').toggleClass('movingUI', power_user.movingUI);
1021986 if (power_user.movingUI === true) {
1022987 initMovingUI();
@@ -1083,8 +1048,6 @@ function applyChatDisplay() {
10831048}
10841049
10851050function applyChatWidth(type) {
1086- power_user.chat_width = Number(localStorage.getItem(storage_keys.chat_width) ?? 50);
1087-
10881051 if (type === 'forced') {
10891052 let r = document.documentElement;
10901053 r.style.setProperty('--sheldWidth', `${power_user.chat_width}vw`);
@@ -1161,12 +1124,9 @@ async function applyCustomCSS() {
11611124}
11621125
11631126async function applyBlurStrength() {
1164- power_user.blur_strength = Number(localStorage.getItem(storage_keys.blur_strength) ?? 1);
11651127 document.documentElement.style.setProperty('--blurStrength', power_user.blur_strength);
11661128 $('#blur_strength_counter').val(power_user.blur_strength);
11671129 $('#blur_strength').val(power_user.blur_strength);
1168-
1169-
11701130}
11711131
11721132async function applyShadowWidth() {
@@ -1178,8 +1138,6 @@ async function applyShadowWidth() {
11781138}
11791139
11801140async function applyFontScale(type) {
1181-
1182- power_user.font_scale = Number(localStorage.getItem(storage_keys.font_scale) ?? 1);
11831141 //this is to allow forced setting on page load, theme swap, etc
11841142 if (type === 'forced') {
11851143 document.documentElement.style.setProperty('--fontScale', power_user.font_scale);
@@ -1215,7 +1173,6 @@ async function applyTheme(name) {
12151173 {
12161174 key: 'blur_strength',
12171175 action: async () => {
1218- localStorage.setItem(storage_keys.blur_strength, power_user.blur_strength);
12191176 await applyBlurStrength();
12201177 },
12211178 },
@@ -1236,7 +1193,6 @@ async function applyTheme(name) {
12361193 {
12371194 key: 'font_scale',
12381195 action: async () => {
1239- localStorage.setItem(storage_keys.font_scale, power_user.font_scale);
12401196 await applyFontScale('forced');
12411197 },
12421198 },
@@ -1279,22 +1235,19 @@ async function applyTheme(name) {
12791235 if (!power_user.chat_width) {
12801236 power_user.chat_width = 50;
12811237 }
1282-
1238+ saveSettingsDebounced();
1283- localStorage.setItem(storage_keys.chat_width, String(power_user.chat_width));
12841239 applyChatWidth('forced');
12851240 },
12861241 },
12871242 {
12881243 key: 'timer_enabled',
12891244 action: async () => {
1290- localStorage.setItem(storage_keys.timer_enabled, Boolean(power_user.timer_enabled));
12911245 switchTimer();
12921246 },
12931247 },
12941248 {
12951249 key: 'timestamps_enabled',
12961250 action: async () => {
1297- localStorage.setItem(storage_keys.timestamps_enabled, Boolean(power_user.timestamps_enabled));
12981251 switchTimestamps();
12991252 },
13001253 },
@@ -1315,35 +1268,30 @@ async function applyTheme(name) {
13151268 {
13161269 key: 'mesIDDisplay_enabled',
13171270 action: async () => {
1318- localStorage.setItem(storage_keys.mesIDDisplay_enabled, Boolean(power_user.mesIDDisplay_enabled));
13191271 switchMesIDDisplay();
13201272 },
13211273 },
13221274 {
13231275 key: 'hideChatAvatars_enabled',
13241276 action: async () => {
1325- localStorage.setItem(storage_keys.hideChatAvatars_enabled, Boolean(power_user.hideChatAvatars_enabled));
13261277 switchHideChatAvatars();
13271278 },
13281279 },
13291280 {
13301281 key: 'expand_message_actions',
13311282 action: async () => {
1332- localStorage.setItem(storage_keys.expand_message_actions, Boolean(power_user.expand_message_actions));
13331283 switchMessageActions();
13341284 },
13351285 },
13361286 {
13371287 key: 'enableZenSliders',
13381288 action: async () => {
1339- localStorage.setItem(storage_keys.enableZenSliders, Boolean(power_user.enableZenSliders));
13401289 switchMessageActions();
13411290 },
13421291 },
13431292 {
13441293 key: 'enableLabMode',
13451294 action: async () => {
1346- localStorage.setItem(storage_keys.enableLabMode, Boolean(power_user.enableLabMode));
13471295 switchMessageActions();
13481296 },
13491297 },
@@ -1517,14 +1465,6 @@ async function loadPowerUserSettings(settings, data) {
15171465 }
15181466
15191467 // These are still local storage
1520- const movingUI = localStorage.getItem(storage_keys.movingUI);
1521- const timer = localStorage.getItem(storage_keys.timer_enabled);
1522- const timestamps = localStorage.getItem(storage_keys.timestamps_enabled);
1523- const mesIDDisplay = localStorage.getItem(storage_keys.mesIDDisplay_enabled);
1524- const hideChatAvatars = localStorage.getItem(storage_keys.hideChatAvatars_enabled);
1525- const expandMessageActions = localStorage.getItem(storage_keys.expand_message_actions);
1526- const enableZenSliders = localStorage.getItem(storage_keys.enableZenSliders);
1527- const enableLabMode = localStorage.getItem(storage_keys.enableLabMode);
15281468 const autoLoadChat = localStorage.getItem(storage_keys.auto_load_chat_legacy);
15291469 const autoConnect = localStorage.getItem(storage_keys.auto_connect_legacy);
15301470
@@ -1538,18 +1478,6 @@ async function loadPowerUserSettings(settings, data) {
15381478 localStorage.removeItem(storage_keys.auto_connect_legacy);
15391479 }
15401480
1541- power_user.movingUI = movingUI === null ? false : movingUI == 'true';
1542- power_user.timer_enabled = timer === null ? true : timer == 'true';
1543- power_user.timestamps_enabled = timestamps === null ? true : timestamps == 'true';
1544- power_user.mesIDDisplay_enabled = mesIDDisplay === null ? true : mesIDDisplay == 'true';
1545- power_user.hideChatAvatars_enabled = hideChatAvatars === null ? true : hideChatAvatars == 'true';
1546- power_user.expand_message_actions = expandMessageActions === null ? true : expandMessageActions == 'true';
1547- power_user.enableZenSliders = enableZenSliders === null ? false : enableZenSliders == 'true';
1548- power_user.enableLabMode = enableLabMode === null ? false : enableLabMode == 'true';
1549- power_user.chat_width = Number(localStorage.getItem(storage_keys.chat_width) ?? 50);
1550- power_user.font_scale = Number(localStorage.getItem(storage_keys.font_scale) ?? 1);
1551- power_user.blur_strength = Number(localStorage.getItem(storage_keys.blur_strength) ?? 10);
1552-
15531481 if (power_user.chat_display === '') {
15541482 power_user.chat_display = chat_styles.DEFAULT;
15551483 }
@@ -1558,10 +1486,6 @@ async function loadPowerUserSettings(settings, data) {
15581486 power_user.waifuMode = false;
15591487 }
15601488
1561- if (power_user.chat_width === '') {
1562- power_user.chat_width = 50;
1563- }
1564-
15651489 if (power_user.tokenizer === tokenizers.LEGACY) {
15661490 power_user.tokenizer = tokenizers.GPT2;
15671491 }
@@ -3297,7 +3221,6 @@ $(document).ready(() => {
32973221
32983222 $('#movingUImode').change(function () {
32993223 power_user.movingUI = $(this).prop('checked');
3300- localStorage.setItem(storage_keys.movingUI, power_user.movingUI);
33013224 switchMovingUI();
33023225 saveSettingsDebounced();
33033226 });
@@ -3329,8 +3252,8 @@ $(document).ready(() => {
33293252 $('#chat_width_slider').on('input', function (e, data) {
33303253 const applyMode = data?.forced ? 'forced' : 'normal';
33313254 power_user.chat_width = Number(e.target.value);
3332- localStorage.setItem(storage_keys.chat_width, power_user.chat_width);
33333255 applyChatWidth(applyMode);
3256+ saveSettingsDebounced();
33343257 setHotswapsDebounced();
33353258 });
33363259
@@ -3360,7 +3283,6 @@ $(document).ready(() => {
33603283 const applyMode = data?.forced ? 'forced' : 'normal';
33613284 power_user.font_scale = Number(e.target.value);
33623285 $('#font_scale_counter').val(power_user.font_scale);
3363- localStorage.setItem(storage_keys.font_scale, power_user.font_scale);
33643286 await applyFontScale(applyMode);
33653287 saveSettingsDebounced();
33663288 });
@@ -3368,7 +3290,6 @@ $(document).ready(() => {
33683290 $('input[name="blur_strength"]').on('input', async function (e) {
33693291 power_user.blur_strength = Number(e.target.value);
33703292 $('#blur_strength_counter').val(power_user.blur_strength);
3371- localStorage.setItem(storage_keys.blur_strength, power_user.blur_strength);
33723293 await applyBlurStrength();
33733294 saveSettingsDebounced();
33743295 });
@@ -3617,14 +3538,14 @@ $(document).ready(() => {
36173538 $('#messageTimerEnabled').on('input', function () {
36183539 const value = !!$(this).prop('checked');
36193540 power_user.timer_enabled = value;
3620- localStorage.setItem(storage_keys.timer_enabled, Boolean(power_user.timer_enabled));
3541+ saveSettingsDebounced();
36213542 switchTimer();
36223543 });
36233544
36243545 $('#messageTimestampsEnabled').on('input', function () {
36253546 const value = !!$(this).prop('checked');
36263547 power_user.timestamps_enabled = value;
3627- localStorage.setItem(storage_keys.timestamps_enabled, Boolean(power_user.timestamps_enabled));
3548+ saveSettingsDebounced();
36283549 switchTimestamps();
36293550 });
36303551
@@ -3632,6 +3553,7 @@ $(document).ready(() => {
36323553 const value = !!$(this).prop('checked');
36333554 power_user.timestamp_model_icon = value;
36343555 localStorage.setItem(storage_keys.timestamp_model_icon, Boolean(power_user.timestamp_model_icon));
3556+ saveSettingsDebounced();
36353557 switchIcons();
36363558 });
36373559
@@ -3645,7 +3567,7 @@ $(document).ready(() => {
36453567 $('#expandMessageActions').on('input', function () {
36463568 const value = !!$(this).prop('checked');
36473569 power_user.expand_message_actions = value;
3648- localStorage.setItem(storage_keys.expand_message_actions, Boolean(power_user.expand_message_actions));
3570+ saveSettingsDebounced();
36493571 switchMessageActions();
36503572 });
36513573
@@ -3658,7 +3580,6 @@ $(document).ready(() => {
36583580 return;
36593581 }
36603582 power_user.enableZenSliders = value;
3661- localStorage.setItem(storage_keys.enableZenSliders, Boolean(power_user.enableZenSliders));
36623583 saveSettingsDebounced();
36633584 switchZenSliders();
36643585 });
@@ -3673,7 +3594,6 @@ $(document).ready(() => {
36733594 }
36743595
36753596 power_user.enableLabMode = value;
3676- localStorage.setItem(storage_keys.enableLabMode, Boolean(power_user.enableLabMode));
36773597 saveSettingsDebounced();
36783598 switchLabMode();
36793599 });
@@ -3681,14 +3601,14 @@ $(document).ready(() => {
36813601 $('#mesIDDisplayEnabled').on('input', function () {
36823602 const value = !!$(this).prop('checked');
36833603 power_user.mesIDDisplay_enabled = value;
3684- localStorage.setItem(storage_keys.mesIDDisplay_enabled, Boolean(power_user.mesIDDisplay_enabled));
3604+ saveSettingsDebounced();
36853605 switchMesIDDisplay();
36863606 });
36873607
36883608 $('#hideChatAvatarsEnabled').on('input', function () {
36893609 const value = !!$(this).prop('checked');
36903610 power_user.hideChatAvatars_enabled = value;
3691- localStorage.setItem(storage_keys.hideChatAvatars_enabled, Boolean(power_user.hideChatAvatars_enabled));
3611+ saveSettingsDebounced();
36923612 switchHideChatAvatars();
36933613 });
36943614