Refactor: Replace Deprecated Code (#4221) * refactor: :recycle: Replace deprecated code defined within this repository - Replace ““/public/scripts.js” > `callPopup`” with ““/public/scripts/popup.js” > `callGenericPopup`”. - Replace ““/public/scripts/tokenizers.js” > `getTokenCount`” with ““/public/scripts/tokenizers.js” > `getTokenCountAsync`”. - Replace ““/public/scripts/extensions/assets/index.js” > `executeSlashCommands`” with ““/public/scripts/extensions/assets/index.js” > `executeSlashCommandsWithOptions`”. * refactor: :recycle: Replace deprecated code from standard library 1. Replace set of deprecated `escape` and deprecated `unescape` functions with `encodeURIComponent` and `decodeURIComponent` functions. 2. Replace set of `encodeURIComponent` and deprecated `unescape` functions with a custom `convertTextToBinaryString` function. * refactor: :recycle: Replace deprecated code imported from external library All of them is from jQuery. 1. Replace `$(document).ready(() => { ... })` → `jQuery(() => { ... })`. 2. Replace event type direct calls. 1) Change - `$('...').change(function () { ... })` → `$('...').on('change', function () { ... })`. 2) Click - `$('...').click(function () { ... })` → `$('...').on('click', function () { ... })`. - `$('...').click()` → `$('...').trigger('click')`. 3) Focus - `$('...').focus(function () { ... })` → `$('...').on('focus', function () { ... })`. - `$('...').focus()` → `$('...').trigger('focus')`. 4) Blur - `$('...').blur(function () { ... })` → `$('...').on('blur', function () { ... })`. 5) Keyup - `$('...').keyup(function () { ... })` → `$('...').on('keyup', function () { ... })`. * refactor(Attachment): :recycle: Merge `convertTextToBinaryString` and `convertTextToBase64` `convertTextToBase64` function use `Uint8Array.prototype.toBase64` if supported by the Browser and use a combination of `Window.btoa` and `String.fromCharCode` as fallback. * fix: :bug: Fix Bind World Info to Character Card Using the new `Popup` class. * fix: :bug: Fix Bind World Info to Character Card Using the new `Popup` class. * refactor: 🐛 Refactor and fix Character World Info popup Add singleton back and some optimization. - 🛡️ Singleton Pattern: Implemented a singleton pattern using the `characterWorldPopup` variable. This prevents multiple instances of the popup from being created, ensuring a clean and predictable UI. If the popup is already open, it will be brought into focus instead of creating a duplicate. - ♻️ Improved Readability: The event handling logic has been extracted into clearly named functions (`handlePrimaryWorldSelect`, `handleExtrasWorldSelect`), making the `Popup` constructor cleaner and the overall code more readable and maintainable. - ⚙️ Optimized Performance: The new implementation caches frequently accessed values and jQuery selectors, reducing redundant DOM lookups and improving performance. --- * refactor(Chat): ♻️ Modernize chat deletion confirmation Replaces the deprecated `callPopup` with the modern `callGenericPopup` for the chat deletion confirmation dialog. * Fix /delchat command * Remove unused code * Fix type. Change value to debug log * Remove value logs * Remove singleton pattern for openCharacterWorldPopup --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

1547a53d7c7de5c9225f33cf5d78486e75bc2623

GregW6 <atlanticgreg1@gmail.com>

Signed

Parents: 649a4b19f4d7bcaff32dae438b720b4828f894b6

public/script.js+133 -110 Viewed

             // Token count update.
             const tokenCountText = this.reasoningHandler.reasoning + processedText;
-            const currentTokenCount = isFinal && power_user.message_token_count_enabled ? getTokenCount(tokenCountText, 0) : 0;
+            const currentTokenCount = isFinal && power_user.message_token_count_enabled ? await getTokenCountAsync(tokenCountText, 0) : 0;
             if (currentTokenCount) {
                 chat[messageId]['extra']['token_count'] = currentTokenCount;
                 if (this.messageTokenCounterDom instanceof HTMLElement) {

     $(root).find('.alternate_grettings_hint').toggle(numberOfGreetings == 0);
+}
-function openCharacterWorldPopup() {
+async function openCharacterWorldPopup() {
     const chid = $('#set_character_world').data('chid');
     if (menu_type != 'create' && chid === undefined) {
         toastr.error('Does not have an Id for this character in world select menu.');
         return;
+    }
-    async function onSelectCharacterWorld() {
+    // TODO: Maybe make this utility function not use the window context?
-        const value = $('.character_world_info_selector').find('option:selected').val();
+    const fileName = getCharaFilename(chid);
-        const worldIndex = value !== '' ? Number(value) : NaN;
+    const charName = (menu_type == 'create' ? create_save.name : characters[chid]?.data?.name) || 'Nameless';
-        const name = !isNaN(worldIndex) ? world_names[worldIndex] : '';
+    const worldId = (menu_type == 'create' ? create_save.world : characters[chid]?.data?.extensions?.world) || '';
+    const template = $('#character_world_template .character_world').clone();
+    template.find('.character_name').text(charName);
+    // --- Event Handlers ---
+    async function handlePrimaryWorldSelect() {
+        const selectedValue = $(this).val();
+        const worldIndex = selectedValue !== '' ? Number(selectedValue) : NaN;
+        const name = !isNaN(worldIndex) ? world_names[worldIndex] : '';
         const previousValue = $('#character_world').val();
         $('#character_world').val(name);

             await createOrEditCharacter();
+        }
-        setWorldInfoButtonClass(undefined, !!value);
+        setWorldInfoButtonClass(undefined, !!name);
+    }
-    function onExtraWorldInfoChanged() {
+    function handleExtrasWorldSelect() {
-        const selectorFieldValue = $('.character_extra_world_info_selector').val();
+        const selectedValues = $(this).val();
-        const selectedWorlds = Array.isArray(selectorFieldValue) ? selectorFieldValue : [];
+        const selectedWorlds = Array.isArray(selectedValues) ? selectedValues : [];
         let charLore = world_info.charLore ?? [];
+        const tempExtraBooks = selectedWorlds.map((index) => world_names[index]).filter(Boolean);
-        // TODO: Maybe make this utility function not use the window context?
-        const fileName = getCharaFilename(chid);
-        const tempExtraBooks = selectedWorlds.map((index) => world_names[index]).filter((e) => e !== undefined);
         const existingCharIndex = charLore.findIndex((e) => e.name === fileName);
-        if (existingCharIndex === -1) {
-            const newCharLoreEntry = {
-                name: fileName,
-                extraBooks: tempExtraBooks,
-            };
-            charLore.push(newCharLoreEntry);
+        if (existingCharIndex === -1) {
+            // Add record only if at least 1 lorebook is selected.
+            if (tempExtraBooks.length > 0) {
+                charLore.push({ name: fileName, extraBooks: tempExtraBooks });
+            }
         } else if (tempExtraBooks.length === 0) {
             charLore.splice(existingCharIndex, 1);
         } else {

         saveSettingsDebounced();
+    }
-    const template = $('#character_world_template .character_world').clone();
+    // --- Populate Dropdowns ---
-    const select = template.find('.character_world_info_selector');
+    // Append to primary dropdown.
-    const extraSelect = template.find('.character_extra_world_info_selector');
+    const primarySelect = template.find('.character_world_info_selector');
-    const name = (menu_type == 'create' ? create_save.name : characters[chid]?.data?.name) || 'Nameless';
+    world_names.forEach((item, i) => {
-    const worldId = (menu_type == 'create' ? create_save.world : characters[chid]?.data?.extensions?.world) || '';
+        primarySelect.append(new Option(item, String(i), item === worldId, item === worldId));
-    template.find('.character_name').text(name);
-    // Not needed on mobile
-    if (!isMobile()) {
-        $(extraSelect).select2({
-            width: '100%',
-            placeholder: t`No auxillary Lorebooks set. Click here to select.`,
-            allowClear: true,
-            closeOnSelect: false,
     });
-    }
-    // Apped to base dropdown
+    // Append to extras dropdown.
+    const extrasSelect = template.find('.character_extra_world_info_selector');
+    const existingCharLore = world_info.charLore?.find((e) => e.name === fileName);
     world_names.forEach((item, i) => {
-        const option = document.createElement('option');
+        const isSelected = !!existingCharLore?.extraBooks.includes(item);
-        option.value = String(i);
+        extrasSelect.append(new Option(item, String(i), isSelected, isSelected));
-        option.innerText = item;
-        option.selected = item === worldId;
-        select.append(option);
     });
-    // Append to extras dropdown
+    const popup = new Popup(template, POPUP_TYPE.TEXT, '', {
-    if (world_names.length > 0) {
+        onOpen: function (popup) {
-        extraSelect.empty();
+            const popupDialog = $(popup.dlg);
-    }
-    world_names.forEach((item, i) => {
-        const option = document.createElement('option');
-        option.value = String(i);
-        option.innerText = item;
-        const existingCharLore = world_info.charLore?.find((e) => e.name === getCharaFilename());
+            primarySelect.on('change', handlePrimaryWorldSelect);
-        if (existingCharLore) {
+            extrasSelect.on('change', handleExtrasWorldSelect);
-            option.selected = existingCharLore.extraBooks.includes(item);
-        } else {
-            option.selected = false;
-        }
-        extraSelect.append(option);
-    });
-    select.on('change', onSelectCharacterWorld);
+            // Not needed on mobile.
-    extraSelect.on('mousedown change', async function (e) {
+            if (!isMobile()) {
-        // If there's no world names, don't do anything
+                extrasSelect.select2({
-        if (world_names.length === 0) {
+                    width: '100%',
-            e.preventDefault();
+                    placeholder: t`No auxiliary Lorebooks set. Click here to select.`,
-            return;
+                    allowClear: true,
+                    closeOnSelect: false,
+                    dropdownParent: popupDialog,
+                });
+            }
+        },
-        onExtraWorldInfoChanged();
     });
-    callPopup(template, 'text');
+    await popup.show();
+}
 function openAlternateGreetings() {

+}
 async function doDeleteChat() {
-    await displayPastChats();
+    return displayPastChats().then(() => new Promise((resolve) => {
-    let currentChatDeleteButton = $('.select_chat_block[highlight=\'true\']').parent().find('.PastChat_cross');
+        let resolved = false;
-    $(currentChatDeleteButton).trigger('click');
+        const timeOutId = setTimeout(() => {
-    await delay(1);
+            toastr.error(t`Chat deletion timed out. Please try again.`);
-    $('#dialogue_popup_ok').trigger('click', { fromSlashCommand: true });
+            setResolved();
-    return '';
+        }, 5000);
+        const setResolved = () => {
+            if (resolved) {
+                return;
+            }
+            resolved = true;
+            [event_types.CHAT_DELETED, event_types.GROUP_CHAT_DELETED].forEach((eventType) => {
+                eventSource.removeListener(eventType, setResolved);
+            });
+            clearTimeout(timeOutId);
+            resolve('');
+        };
+        [event_types.CHAT_DELETED, event_types.GROUP_CHAT_DELETED].forEach((eventType) => {
+            eventSource.on(eventType, setResolved);
+        });
+        const currentChatDeleteButton = $('.select_chat_block[highlight=\'true\']').parent().find('.PastChat_cross');
+        $(currentChatDeleteButton).trigger('click', { fromSlashCommand: true });
+    }));
+}
 async function doRenameChat(_, chatName) {

     });
     $('#send_but, #option_regenerate, #option_continue, #mes_continue, #mes_impersonate').on('click', () => {
         if (S_TAPreviouslyFocused) {
-            $('#send_textarea').focus();
+            $('#send_textarea').trigger('focus');
+        }
     });
-    $(document).click(event => {
+    $(document).on('click', event => {
         if ($(':focus').attr('id') !== 'send_textarea') {
             var validIDs = ['options_button', 'send_but', 'mes_impersonate', 'mes_continue', 'send_textarea', 'option_regenerate', 'option_continue'];
             if (!validIDs.includes($(event.target).attr('id'))) {

     /////////////////
-    $('#swipes-checkbox').change(function () {
+    $('#swipes-checkbox').on('change', function () {
         swipes = !!$('#swipes-checkbox').prop('checked');
         if (swipes) {
             //console.log('toggle change calling showswipebtns');

+        }
     });
-    $(document).on('click', '.PastChat_cross', function (e) {
+    /**
+     * Handles the deletion of a chat file, including group chats.
+     *
+     * @param {string} chatFile - The name of the chat file to delete.
+     * @param {object} group - The group object if the chat is part of a group.
+     * @param {boolean} [fromSlashCommand=false] - Whether the deletion was triggered from a slash command.
+     * @returns {Promise<void>}
+     */
+    async function handleDeleteChat(chatFile, group, fromSlashCommand = false) {
+        // Close past chat popup.
+        $('#select_chat_cross').trigger('click');
+        showLoader();
+        if (group) {
+            await deleteGroupChat(group, chatFile);
+        } else {
+            await delChat(chatFile);
+        }
+        if (fromSlashCommand) {  // When called from `/delchat` command, don't re-open the history view.
+            $('#options').hide();  // Hide option popup menu.
+            hideLoader();
+        } else {  // Open the history view again after 2 seconds (delay to avoid edge cases for deleting last chat).
+            setTimeout(function () {
+                $('#option_select_chat').trigger('click');
+                $('#options').hide();  // Hide option popup menu.
+                hideLoader();
+            }, 2000);
+        }
+    }
+    $(document).on('click', '.PastChat_cross', async function (e, { fromSlashCommand = false } = {}) {
         e.stopPropagation();
         chat_file_for_del = $(this).attr('file_name');
         console.debug('detected cross click for' + chat_file_for_del);
-        callPopup('<h3>' + t`Delete the Chat File?` + '</h3>', 'del_chat');
+        // Skip confirmation if called from a slash command.
+        if (fromSlashCommand) {
+            await handleDeleteChat(chat_file_for_del, selected_group, true);
+            return;
+        }
+        const result = await callGenericPopup('<h3>' + t`Delete the Chat File?` + '</h3>', POPUP_TYPE.CONFIRM);
+        if (result === POPUP_RESULT.AFFIRMATIVE) {
+            await handleDeleteChat(chat_file_for_del, selected_group, false);
+        }
     });
     $('#advanced_div').on('click', function () {

         }, animation_duration);
         if (popup_type == 'del_chat') {
-            //close past chat popup
+            await handleDeleteChat(chat_file_for_del, selected_group, fromSlashCommand);
-            $('#select_chat_cross').trigger('click');
-            showLoader();
-            if (selected_group) {
-                await deleteGroupChat(selected_group, chat_file_for_del);
-            } else {
-                await delChat(chat_file_for_del);
-            }
-            if (fromSlashCommand) {  // When called from `/delchat` command, don't re-open the history view.
-                $('#options').hide();  // hide option popup menu
-                hideLoader();
-            } else {  // Open the history view again after 2 seconds (delay to avoid edge cases for deleting last chat).
-                setTimeout(function () {
-                    $('#option_select_chat').trigger('click');
-                    $('#options').hide();  // hide option popup menu
-                    hideLoader();
-                }, 2000);
-            }
+        }
         if (dialogueResolve) {

         is_delete_mode = false;
     });
-    $('#settings_preset').change(function () {
+    $('#settings_preset').on('change', function () {
         if ($('#settings_preset').find(':selected').val() != 'gui') {
             preset_settings = $('#settings_preset').find(':selected').text();
             const preset = koboldai_settings[koboldai_setting_names[preset_settings]];

         saveSettingsDebounced();
     });
-    $('#settings_preset_novel').change(function () {
+    $('#settings_preset_novel').on('change', function () {
         nai_settings.preset_settings_novel = $('#settings_preset_novel')
             .find(':selected')
             .text();

         saveSettingsDebounced();
     });
-    $('#main_api').change(function () {
+    $('#main_api').on('change', function () {
         cancelStatusCheck('Canceled because main api changed');
         changeMainAPI();
         saveSettingsDebounced();

         select_rm_characters();
     });
-    $('#dupe_button').click(async function () {
+    $('#dupe_button').on('click', async function () {
         await duplicateCharacter();
     });

+        }
     });
-    $(document).keyup(function (e) {
+    $(document).on('keyup', function (e) {
         if (e.key === 'Escape') {
             const isEditVisible = $('#curEditTextarea').is(':visible') || $('.reasoning_edit_textarea').length > 0;
             if (isEditVisible && power_user.auto_save_msg_edits === false) {
                 closeMessageEditor('all');
-                $('#send_textarea').focus();
+                $('#send_textarea').trigger('focus');
                 return;
+            }
             if (isEditVisible && power_user.auto_save_msg_edits === true) {
                 $(`#chat .mes[mesid="${this_edit_mes_id}"] .mes_edit_done`).trigger('click');
                 closeMessageEditor('reasoning');
-                $('#send_textarea').focus();
+                $('#send_textarea').trigger('focus');
                 return;
+            }
             if (!this_edit_mes_id && $('#mes_stop').is(':visible')) {

         const target = $(targetElement.selectedOptions).attr('id');
         switch (target) {
             case 'set_character_world':
-                openCharacterWorldPopup();
+                await openCharacterWorldPopup();
                 break;
             case 'set_chat_scenario':
                 await setScenarioOverride();
                 break;
             case 'renameCharButton':
-                renameCharacter();
+                await renameCharacter();
                 break;
             case 'import_character_info':
                 await importEmbeddedWorldInfo();

     });
     $(document).on('change', '.range-block-counter input, .neo-range-input', function (e) {
+        if (!(e.target instanceof HTMLElement)) {
+            return;
+        }
         e.target.focus();
         e.target.dispatchEvent(new KeyboardEvent('keyup', { bubbles: true }));
     });

                 } else {
                     //if value not ok, warn and reset to last known valid value
                     toastr.warning(`Invalid value. Must be between ${$(this).attr('min')} and ${$(this).attr('max')}`);
-                    console.log(valueBeforeManualInput);
                     //newSlider.val(valueBeforeManualInput)
                     $(this).val(valueBeforeManualInput);
+                }

     $(document).on('keyup', '.range-block-counter input, .neo-range-input', function () {
         valueBeforeManualInput = $(this).val();
-        console.log(valueBeforeManualInput);
         isManualInput = true;
     });

@@ -12383,7 +12407,6 @@ jQuery(async function () {
12383	} else {	12407	} else {
12384	//if value not ok, warn and reset to last known valid value	12408	//if value not ok, warn and reset to last known valid value
12385	toastr.warning(`Invalid value. Must be between ${$(this).attr('min')} and ${$(this).attr('max')}`);	12409	toastr.warning(`Invalid value. Must be between ${$(this).attr('min')} and ${$(this).attr('max')}`);
12386	console.log(valueBeforeManualInput);
12387	$(this).val(valueBeforeManualInput);	12410	$(this).val(valueBeforeManualInput);
12388	}	12411	}
12389	}	12412	}

public/scripts/RossAscends-mods.js+11 -11 Viewed

@@ -434,19 +434,19 @@ function OpenNavPanels() {
434	//auto-open R nav if locked and previously open	434	//auto-open R nav if locked and previously open
435	if (accountStorage.getItem('NavLockOn') == 'true' && accountStorage.getItem('NavOpened') == 'true') {	435	if (accountStorage.getItem('NavLockOn') == 'true' && accountStorage.getItem('NavOpened') == 'true') {
436	//console.log("RA -- clicking right nav to open");	436	//console.log("RA -- clicking right nav to open");
437	$('#rightNavDrawerIcon').click();	437	$('#rightNavDrawerIcon').trigger('click');
438	}	438	}
439		439
440	//auto-open L nav if locked and previously open	440	//auto-open L nav if locked and previously open
441	if (accountStorage.getItem('LNavLockOn') == 'true' && accountStorage.getItem('LNavOpened') == 'true') {	441	if (accountStorage.getItem('LNavLockOn') == 'true' && accountStorage.getItem('LNavOpened') == 'true') {
442	console.debug('RA -- clicking left nav to open');	442	console.debug('RA -- clicking left nav to open');
443	$('#leftNavDrawerIcon').click();	443	$('#leftNavDrawerIcon').trigger('click');
444	}	444	}
445		445
446	//auto-open WI if locked and previously open	446	//auto-open WI if locked and previously open
447	if (accountStorage.getItem('WINavLockOn') == 'true' && accountStorage.getItem('WINavOpened') == 'true') {	447	if (accountStorage.getItem('WINavLockOn') == 'true' && accountStorage.getItem('WINavOpened') == 'true') {
448	console.debug('RA -- clicking WI to open');	448	console.debug('RA -- clicking WI to open');
449	$('#WIDrawerIcon').click();	449	$('#WIDrawerIcon').trigger('click');
450	}	450	}
451	}	451	}
452	}	452	}

         RA_autoconnect();
+    }
-    $('#main_api').change(function () {
+    $('#main_api').on('change', function () {
         var PrevAPI = main_api;
         setTimeout(() => RA_autoconnect(PrevAPI), 100);
     });

     });
     var chatbarInFocus = false;
-    $('#send_textarea').focus(function () {
+    $('#send_textarea').on('focus', function () {
         chatbarInFocus = true;
     });
-    $('#send_textarea').blur(function () {
+    $('#send_textarea').on('blur', function () {
         chatbarInFocus = false;
     });

         OpenNavPanels();
     }, 300);
-    $(SelectedCharacterTab).click(function () { accountStorage.setItem('SelectedNavTab', 'rm_button_selected_ch'); });
+    $(SelectedCharacterTab).on('click', function () { accountStorage.setItem('SelectedNavTab', 'rm_button_selected_ch'); });
-    $('#rm_button_characters').click(function () { accountStorage.setItem('SelectedNavTab', 'rm_button_characters'); });
+    $('#rm_button_characters').on('click', function () { accountStorage.setItem('SelectedNavTab', 'rm_button_characters'); });
     // when a char is selected from the list, save them as the auto-load character for next page load

@@ -932,7 +932,7 @@ export function initRossMods() {
932	var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');	932	var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');
933	if (SwipeTargetMesClassParent !== null) {	933	if (SwipeTargetMesClassParent !== null) {
934	if (SwipeButR.css('display') === 'flex') {	934	if (SwipeButR.css('display') === 'flex') {
935	SwipeButR.click();	935	SwipeButR.trigger('click');
936	}	936	}
937	}	937	}
938	});	938	});

@@ -956,7 +956,7 @@ export function initRossMods() {
956	var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');	956	var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');
957	if (SwipeTargetMesClassParent !== null) {	957	if (SwipeTargetMesClassParent !== null) {
958	if (SwipeButL.css('display') === 'flex') {	958	if (SwipeButL.css('display') === 'flex') {
959	SwipeButL.click();	959	SwipeButL.trigger('click');
960	}	960	}
961	}	961	}
962	});	962	});

@@ -1159,7 +1159,7 @@ export function initRossMods() {
1159	const lastMes = document.querySelector('.last_mes');	1159	const lastMes = document.querySelector('.last_mes');
1160	const editMes = lastMes.querySelector('.mes_block .mes_edit');	1160	const editMes = lastMes.querySelector('.mes_block .mes_edit');
1161	if (editMes !== null) {	1161	if (editMes !== null) {
1162	$(editMes).click();	1162	$(editMes).trigger('click');
1163	return;	1163	return;
1164	}	1164	}
1165	}	1165	}

public/scripts/cfg-scale.js+1 -1 Viewed

             .siblings('.inline-drawer-content')
             .css('display') !== 'block') {
             $('#floatingPrompt').addClass('resizing');
-            $('#CFGBlockToggle').click();
+            $('#CFGBlockToggle').trigger('click');
+        }
     } else {
         //hide AN if it's already displayed

public/scripts/chats.js+6 -5 Viewed

     download,
     getFileText,
     getFileExtension,
+    convertTextToBase64,
 } from './utils.js';
 import { extension_settings, renderExtensionTemplateAsync, saveMetadataDebounced } from './extensions.js';
 import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';

                 try {
                     const converter = getConverter(file.type);
                     const fileText = await converter(file);
-                    base64Data = window.btoa(unescape(encodeURIComponent(fileText)));
+                    base64Data = convertTextToBase64(fileText);
                 } catch (error) {
                     toastr.error(String(error), t`Could not convert file`);
                     console.error('Could not convert file', error);

 export function encodeStyleTags(text) {
     const styleRegex = /<style>(.+?)<\/style>/gims;
     return text.replaceAll(styleRegex, (_, match) => {
-        return `<custom-style>${escape(match)}</custom-style>`;
+        return `<custom-style>${encodeURIComponent(match)}</custom-style>`;
     });
+}

     return text.replaceAll(styleDecodeRegex, (_, style) => {
         try {
-            let styleCleaned = unescape(style).replaceAll(/<br\/>/g, '');
+            let styleCleaned = decodeURIComponent(style).replaceAll(/<br\/>/g, '');
             const ast = css.parse(styleCleaned);
             const sheet = ast?.stylesheet;
             if (sheet) {

         try {
             const converter = getConverter(file.type);
             const fileText = await converter(file);
-            base64Data = window.btoa(unescape(encodeURIComponent(fileText)));
+            base64Data = convertTextToBase64(fileText);
         } catch (error) {
             toastr.error(String(error), t`Could not convert file`);
             console.error('Could not convert file', error);
+        }
     } else {
         const fileText = await file.text();
-        base64Data = window.btoa(unescape(encodeURIComponent(fileText)));
+        base64Data = convertTextToBase64(fileText);
+    }
     const fileUrl = await uploadFileAttachment(uniqueFileName, base64Data);

public/scripts/extensions/assets/index.js+2 -2 Viewed

 import { getRequestHeaders, processDroppedFiles, eventSource, event_types } from '../../../script.js';
 import { deleteExtension, extensionNames, getContext, installExtension, renderExtensionTemplateAsync } from '../../extensions.js';
 import { POPUP_TYPE, Popup, callGenericPopup } from '../../popup.js';
-import { executeSlashCommands } from '../../slash-commands.js';
+import { executeSlashCommandsWithOptions } from '../../slash-commands.js';
 import { accountStorage } from '../../util/AccountStorage.js';
 import { flashHighlight, getStringHash, isValidUrl } from '../../utils.js';
 import { t } from '../../i18n.js';

                         const assetDelete = async function () {
                             if (assetType === 'character') {
                                 toastr.error('Go to the characters menu to delete a character.', 'Character deletion not supported');
-                                await executeSlashCommands(`/go ${asset['id']}`);
+                                await executeSlashCommandsWithOptions(`/go ${asset['id']}`);
                                 return;
+                            }
                             element.off('click');

public/scripts/extensions/token-counter/index.js+0 -13 Viewed

 import { renderExtensionTemplateAsync } from '../../extensions.js';
 import { t } from '../../i18n.js';
-function rgb2hex(rgb) {
-    rgb = rgb.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);
-    return (rgb && rgb.length === 4) ? '#' +
-        ('0' + parseInt(rgb[1], 10).toString(16)).slice(-2) +
-        ('0' + parseInt(rgb[2], 10).toString(16)).slice(-2) +
-        ('0' + parseInt(rgb[3], 10).toString(16)).slice(-2) : '';
-}
-$('button').click(function () {
-    var hex = rgb2hex($('input').val());
-    $('.result').html(hex);
-});
 async function doTokenCounter() {
     const { tokenizerName, tokenizerId } = getFriendlyTokenizerName(main_api);
     const html = await renderExtensionTemplateAsync('token-counter', 'window', { tokenizerName });

public/scripts/extensions/tts/alltalk.js+9 -9 Viewed

             const ttsNarrateDialoguesCheckbox = document.getElementById('tts_narrate_dialogues');
             if (this.settings.narrator_enabled) {
                 ttsPassAsterisksCheckbox.checked = false;
-                $('#tts_pass_asterisks').click();
+                $('#tts_pass_asterisks').trigger('click');
                 $('#tts_pass_asterisks').trigger('change');
+            }
             if (!this.settings.narrator_enabled) {
                 ttsPassAsterisksCheckbox.checked = true;
-                $('#tts_pass_asterisks').click();
+                $('#tts_pass_asterisks').trigger('click');
                 $('#tts_pass_asterisks').trigger('change');
+            }
             if (this.settings.narrator_enabled) {
                 ttsNarrateQuotedCheckbox.checked = true;
                 ttsNarrateDialoguesCheckbox.checked = true;
-                $('#tts_narrate_quoted').click();
+                $('#tts_narrate_quoted').trigger('click');
                 $('#tts_narrate_quoted').trigger('change');
-                $('#tts_narrate_dialogues').click();
+                $('#tts_narrate_dialogues').trigger('click');
                 $('#tts_narrate_dialogues').trigger('change');
+            }
             atNarratorSelect.value = this.settings.narrator_enabled.toString();

                 if (narratorOption === 'true') {
                     ttsPassAsterisksCheckbox.checked = false;
-                    $('#tts_pass_asterisks').click();
+                    $('#tts_pass_asterisks').trigger('click');
                     $('#tts_pass_asterisks').trigger('change');
                     ttsNarrateQuotedCheckbox.checked = true;
                     ttsNarrateDialoguesCheckbox.checked = true;
-                    $('#tts_narrate_quoted').click();
+                    $('#tts_narrate_quoted').trigger('click');
                     $('#tts_narrate_quoted').trigger('change');
-                    $('#tts_narrate_dialogues').click();
+                    $('#tts_narrate_dialogues').trigger('click');
                     $('#tts_narrate_dialogues').trigger('change');
                 } else if (narratorOption === 'silent') {
                     ttsPassAsterisksCheckbox.checked = false;
-                    $('#tts_pass_asterisks').click();
+                    $('#tts_pass_asterisks').trigger('click');
                     $('#tts_pass_asterisks').trigger('change');
                 } else {
                     ttsPassAsterisksCheckbox.checked = true;
-                    $('#tts_pass_asterisks').click();
+                    $('#tts_pass_asterisks').trigger('click');
                     $('#tts_pass_asterisks').trigger('change');
+                }

public/scripts/nai-settings.js+1 -1 Viewed

         saveSettingsDebounced();
     });
-    $('#model_novel_select').change(function () {
+    $('#model_novel_select').on('change', function () {
         nai_settings.model_novel = String($('#model_novel_select').find(':selected').val());
         saveSettingsDebounced();

public/scripts/power-user.js+9 -9 Viewed

     $('#character_popup').trigger('input');
+}
-$(document).ready(() => {
+jQuery(() => {
     const adjustAutocompleteDebounced = debounce(() => {
         $('.ui-autocomplete-input').each(function () {
             const isOpen = $(this).autocomplete('widget')[0].style.display !== 'none';

     });
     // Settings that go to settings.json
-    $('#collapse-newlines-checkbox').change(function () {
+    $('#collapse-newlines-checkbox').on('change', function () {
         power_user.collapse_newlines = !!$(this).prop('checked');
         saveSettingsDebounced();
     });

     // include newline is the child of trim sentences
     // if include newline is checked, trim sentences must be checked
     // if trim sentences is unchecked, include newline must be unchecked
-    $('#trim_sentences_checkbox').change(function () {
+    $('#trim_sentences_checkbox').on('change', function () {
         power_user.trim_sentences = !!$(this).prop('checked');
         saveSettingsDebounced();
     });

     $('#bind_model_templates').on('change', updateBindModelTemplatesState);
-    $('#always-force-name2-checkbox').change(function () {
+    $('#always-force-name2-checkbox').on('change', function () {
         power_user.always_force_name2 = !!$(this).prop('checked');
         saveSettingsDebounced();
     });

         saveSettingsDebounced();
     });
-    $('#chat-show-reply-prefix-checkbox').change(function () {
+    $('#chat-show-reply-prefix-checkbox').on('change', function () {
         power_user.show_user_prompt_bias = !!$(this).prop('checked');
         reloadCurrentChat();
         saveSettingsDebounced();

         saveSettingsDebounced();
     });
-    $('#fast_ui_mode').change(function () {
+    $('#fast_ui_mode').on('change', function () {
         power_user.fast_ui_mode = $(this).prop('checked');
         switchUiMode();
         saveSettingsDebounced();

         applyCustomCSS();
     });
-    $('#movingUImode').change(function () {
+    $('#movingUImode').on('change', function () {
         power_user.movingUI = $(this).prop('checked');
         switchMovingUI();
         saveSettingsDebounced();
     });
-    $('#noShadowsmode').change(function () {
+    $('#noShadowsmode').on('change', function () {
         power_user.noShadows = $(this).prop('checked');
         applyNoShadows();
         saveSettingsDebounced();

         saveSettingsDebounced();
     });
-    $('#custom_stopping_strings_macro').change(function () {
+    $('#custom_stopping_strings_macro').on('change', function () {
         power_user.custom_stopping_strings_macro = !!$(this).prop('checked');
         saveSettingsDebounced();
     });

public/scripts/server-history.js+1 -1 Viewed

             select: (e, u) => selectServer(e, u, serverLabel),
             minLength: 0,
         })
-        .focus(onInputFocus); // <== show tag list on click
+        .on('focus', onInputFocus); // <== show tag list on click
+}
 function onInputFocus() {

public/scripts/tags.js+1 -1 Viewed

             select: (e, u) => selectTag(e, u, listSelector, { tagListOptions: tagListOptions }),
             minLength: 0,
         })
-        .focus(onTagInputFocus); // <== show tag list on click
+        .on('focus', onTagInputFocus); // <== show tag list on click
+}
 async function onViewTagsListClick() {

public/scripts/utils.js+21 -0 Viewed

+}
 /**
+ * Converts UTF-8 string into Base64-encoded string.
+ *
+ * @param {string} text The UTF-8 string
+ * @returns {string} The Base64-encoded string
+ */
+export function convertTextToBase64(text) {
+    const encoder = new TextEncoder();
+    const utf8Bytes = encoder.encode(text);
+    /**
+     * return `true` if `Uint8Array.prototype.toBase64` function is supported.
+     * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array/toBase64|MDN Reference}
+     */
+    if ('toBase64' in Uint8Array.prototype) {
+        return utf8Bytes.toBase64();
+    }
+    // Creates binary string, where each character's code point directly matches the byte value (0-255).
+    const binaryString = String.fromCharCode(...utf8Bytes);
+    return window.btoa(binaryString);
+}
+/**
  * Loads either a CSS or JS file and appends it to the appropriate document section.
+ *
  * @param {string} url - The URL of the file to be loaded.