Display loader earlier, init toast classes in power-user

34490c9614912c4cd8c6612180b2aa04be8ce513

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/script.js+1 -4 Viewed

+    }
 });
-//showLoader(); <-- must wait for poweruser (called from firstinit()), so moved it in there
 // Configure toast library:
 toastr.options.escapeHtml = true; // Prevent raw HTML inserts
 toastr.options.timeOut = 4000; // How long the toast will display without user interaction

         const tokenData = await tokenResponse.json();
         token = tokenData.token;
     } catch {
-        hideLoader();
         toastr.error(t`Couldn't get CSRF token. Please refresh the page.`, t`Error`, { timeOut: 0, extendedTimeOut: 0, preventDuplicates: true });
         throw new Error('Initialization failed');
+    }
+    showLoader();
     initLibraryShims();
     addShowdownPatch(showdown);
     reloadMarkdownProcessor();

     await initPresetManager();
     await getSystemMessages();
     await getSettings();
-    showLoader();
     initKeyboard();
     initDynamicStyles();
     initTags();

public/scripts/popup.js+2 -10 Viewed

 import dialogPolyfill from '../lib/dialog-polyfill.esm.js';
 import { shouldSendOnEnter } from './RossAscends-mods.js';
-import { power_user } from './power-user.js';
+import { power_user, toastPositionClasses } from './power-user.js';
 import { removeFromArray, runAfterAnimation, uuidv4 } from './utils.js';
 /** @readonly */

     if (!toastContainer) {
         toastContainer = document.createElement('div');
         toastContainer.setAttribute('id', 'toast-container');
-        if (power_user.toastr_position) {
-            toastr.options.positionClass = (power_user.toastr_position);
-        } else {
-            console.warn('Did not find poweruser.toastr_position; defaulting to top center');
-            power_user.toastr_position = 'toast-top-center';
-            toastr.options.positionClass = (power_user.toastr_position);
-            $(`#toastr_position option[value=${power_user.toastr_position}]`).attr('selected', true);
-        }
-        //if (toastr.options.positionClass) toastContainer.classList.add(toastr.options.positionClass);
+    }
     // Check if toastr is already a child. If not, we need to move it inside this dialog.

@@ -752,6 +743,7 @@ export function fixToastrForDialogs() {
752	toastContainer.remove();	743	toastContainer.remove();
753	} else {	744	} else {
754	document.body.appendChild(toastContainer);	745	document.body.appendChild(toastContainer);
		746	toastContainer.classList.remove(...toastPositionClasses);
755	toastContainer.classList.add(toastr.options.positionClass);	747	toastContainer.classList.add(toastr.options.positionClass);
756	}	748	}
757	}	749	}

public/scripts/power-user.js+18 -33 Viewed

 import { AUTOCOMPLETE_SELECT_KEY, AUTOCOMPLETE_WIDTH } from './autocomplete/AutoComplete.js';
 import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
-import { POPUP_TYPE, callGenericPopup } from './popup.js';
+import { POPUP_TYPE, callGenericPopup, fixToastrForDialogs } from './popup.js';
 import { loadSystemPrompts } from './sysprompt.js';
 import { fuzzySearchCategories } from './filters.js';
 import { accountStorage } from './util/AccountStorage.js';

     applyPowerUserSettings,
 };
+export const toastPositionClasses = [
+    'toast-top-left',
+    'toast-top-center',
+    'toast-top-right',
+    'toast-bottom-left',
+    'toast-bottom-center',
+    'toast-bottom-right',
+];
 export const MAX_CONTEXT_DEFAULT = 8192;
 export const MAX_RESPONSE_DEFAULT = 2048;
 const MAX_CONTEXT_UNLOCKED = 512 * 1024;

 const defaultStoryString = '{{#if system}}{{system}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}\'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}';
 const defaultExampleSeparator = '***';
 const defaultChatStart = '***';
+const defaultToastPosition = 'toast-top-center';
 const avatar_styles = {
     ROUND: 0,

     fast_ui_mode: true,
     avatar_style: avatar_styles.ROUND,
     chat_display: chat_styles.DEFAULT,
-    toastr_position: 'toast-top-center',
+    toastr_position: defaultToastPosition,
     chat_width: 50,
     never_resize_avatars: false,
     show_card_avatar_urls: false,

+}
 function applyToastrPosition() {
+    if (!toastPositionClasses.includes(power_user.toastr_position)) {
-    if (!power_user.toastr_position) {
+        power_user.toastr_position = defaultToastPosition;
-        power_user.toastr_position = 'toast-top-center';
+        console.warn(`applyToastrPosition: invalid toastr position, defaulting to ${defaultToastPosition}`);
-        console.warn('applyToastrPosition: missing toastr position, defaulting to top-center');
-    }
-    switch (power_user.toastr_position) {
-        case 'toast-top-left': {
-            toastr.options.positionClass = 'toast-top-left';
-            break;
-        }
-        case 'toast-top-center': {
-            toastr.options.positionClass = 'toast-top-center';
-            break;
-        }
-        case 'toast-top-right': {
-            toastr.options.positionClass = 'toast-top-right';
-            break;
-        }
-        case 'toast-bottom-left': {
-            toastr.options.positionClass = 'toast-bottom-left';
-            break;
-        }
-        case 'toast-bottom-center': {
-            toastr.options.positionClass = 'toast-bottom-center';
-            break;
-        }
-        case 'toast-bottom-right': {
-            toastr.options.positionClass = 'toast-bottom-right';
-            break;
-        }
+    }
+    toastr.options.positionClass = power_user.toastr_position;
+    fixToastrForDialogs();
     $('#toastr_position').val(power_user.toastr_position).prop('selected', true);
+}

     loadMovingUIState();
     loadCharListState();
     toggleMDHotkeyIconDisplay();
+    applyToastrPosition();
+}
 function toggleMDHotkeyIconDisplay() {