diff --git a/public/script.js b/public/script.js index 68b87dc47..d185c8030 100644 --- a/public/script.js +++ b/public/script.js @@ -313,7 +313,7 @@ await new Promise((resolve) => { } }); -showLoader(); +//showLoader(); <-- must wait for poweruser (called from firstinit()), so moved it in there // Configure toast library: toastr.options.escapeHtml = true; // Prevent raw HTML inserts @@ -990,6 +990,7 @@ async function firstLoadInit() { await initPresetManager(); await getSystemMessages(); await getSettings(); + showLoader(); initKeyboard(); initDynamicStyles(); initTags(); @@ -7595,8 +7596,6 @@ export async function getSettings() { // Apply theme toggles from power user settings applyPowerUserSettings(); - toastr.options.positionClass = power_user.toastr_position; // Where to position the toast container - // Load character tags loadTagsSettings(settings); diff --git a/public/scripts/popup.js b/public/scripts/popup.js index ef999670c..824f792d0 100644 --- a/public/scripts/popup.js +++ b/public/scripts/popup.js @@ -718,7 +718,6 @@ export function getTopmostModalLayer() { */ export function fixToastrForDialogs() { // Hacky way of getting toastr to actually display on top of the popup... - const dlg = Array.from(document.querySelectorAll('dialog[open]:not([closing])')).pop(); let toastContainer = document.getElementById('toast-container'); @@ -726,7 +725,15 @@ export function fixToastrForDialogs() { if (!toastContainer) { toastContainer = document.createElement('div'); toastContainer.setAttribute('id', 'toast-container'); - if (toastr.options.positionClass) toastContainer.classList.add(toastr.options.positionClass); + 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.