7c9b3471 · permissionBRICK/SillyTavern

public/script.js+11 -3 Viewed

     stopStatusLoading();
+}
+/**
+ * Switches the currently selected character to the one with the given ID. (character index, not the character key!)
+ *
+ * If the character ID doesn't exist, if the chat is being saved, or if a group is being generated, this function does nothing.
+ * If the character is different from the currently selected one, it will clear the chat and reset any selected character or group.
+ * @param {number} id The ID of the character to switch to.
+ */
 export async function selectCharacterById(id) {
     if (characters[id] === undefined) {
         return;

+    }
     // Populate the template
     const template = $('#character_template .character_select').clone();
-    template.attr({ 'chid': id, 'id': `CharID${id}` });
+    template.attr({ 'data-chid': id, 'id': `CharID${id}` });
     template.find('img').attr('src', this_avatar).attr('alt', item.name);
     template.find('.avatar').attr('title', `[Character] ${item.name}\nFile: ${item.avatar}`);
     template.find('.ch_name').text(item.name).attr('title', `[Character] ${item.name}`);

             if (newChId !== -1) {
                 // Select the character after the renaming
                 this_chid = -1;
-                await selectCharacterById(String(newChId));
+                await selectCharacterById(newChId);
                 // Async delay to update UI
                 await delay(1);

     });
     $(document).on('click', '.character_select', async function () {
-        const id = $(this).attr('chid');
+        const id = Number($(this).attr('data-chid'));
         await selectCharacterById(id);
     });

public/scripts/BulkEditOverlay.js+8 -8 Viewed

      * @param {HTMLElement} currentCharacter - The html element of the currently toggled character
      */
     handleShiftClick = (currentCharacter) => {
-        const characterId = currentCharacter.getAttribute('chid');
+        const characterId = Number(currentCharacter.getAttribute('data-chid'));
         const select = !this.selectedCharacters.includes(characterId);
         if (this.lastSelected.characterId && this.lastSelected.select !== undefined) {

      * @param {boolean} [param1.markState] - Whether the toggle of this character should be remembered as the last done toggle
      */
     toggleSingleCharacter = (character, { markState = true } = {}) => {
-        const characterId = character.getAttribute('chid');
+        const characterId = Number(character.getAttribute('data-chid'));
         const select = !this.selectedCharacters.includes(characterId);
         const legacyBulkEditCheckbox = character.querySelector('.' + BulkEditOverlay.legacySelectedClass);

         if (select) {
             character.classList.add(BulkEditOverlay.selectedClass);
             if (legacyBulkEditCheckbox) legacyBulkEditCheckbox.checked = true;
-            this.#selectedCharacters.push(String(characterId));
+            this.#selectedCharacters.push(characterId);
         } else {
             character.classList.remove(BulkEditOverlay.selectedClass);
             if (legacyBulkEditCheckbox) legacyBulkEditCheckbox.checked = false;
-            this.#selectedCharacters = this.#selectedCharacters.filter(item => String(characterId) !== item);
+            this.#selectedCharacters = this.#selectedCharacters.filter(item => characterId !== item);
+        }
         this.updateSelectedCount();

      * @param {boolean} select - <c>true</c> if the characters in the range are to be selected, <c>false</c> if deselected
      */
     toggleCharactersInRange = (currentCharacter, select) => {
-        const currentCharacterId = currentCharacter.getAttribute('chid');
+        const currentCharacterId = Number(currentCharacter.getAttribute('data-chid'));
         const characters = Array.from(document.querySelectorAll('#' + BulkEditOverlay.containerId + ' .' + BulkEditOverlay.characterClass));
-        const startIndex = characters.findIndex(c => c.getAttribute('chid') === this.lastSelected.characterId);
+        const startIndex = characters.findIndex(c => Number(c.getAttribute('data-chid')) === Number(this.lastSelected.characterId));
-        const endIndex = characters.findIndex(c => c.getAttribute('chid') === currentCharacterId);
+        const endIndex = characters.findIndex(c => Number(c.getAttribute('data-chid')) === currentCharacterId);
         for (let i = Math.min(startIndex, endIndex); i <= Math.max(startIndex, endIndex); i++) {
             const character = characters[i];
-            const characterId = character.getAttribute('chid');
+            const characterId = Number(character.getAttribute('data-chid'));
             const isCharacterSelected = this.selectedCharacters.includes(characterId);
             // Only toggle the character if it wasn't on the state we have are toggling towards.

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

         if (active_character !== null && active_character !== undefined) {
             const active_character_id = characters.findIndex(x => getTagKeyForEntity(x) === active_character);
             if (active_character_id !== null) {
-                await selectCharacterById(String(active_character_id));
+                await selectCharacterById(active_character_id);
                 // Do a little tomfoolery to spoof the tag selector
                 const selectedCharElement = $(`#rm_print_characters_block .character_select[chid="${active_character_id}"]`);

     // when a char is selected from the list, save their name as the auto-load character for next page load
     $(document).on('click', '.character_select', function () {
-        const characterId = $(this).attr('chid') || $(this).data('id');
+        const characterId = $(this).attr('data-chid');
         setActiveCharacter(characterId);
         setActiveGroup(null);
         saveSettingsDebounced();
     });
     $(document).on('click', '.group_select', function () {
-        const groupId = $(this).attr('chid') || $(this).attr('grid') || $(this).data('id');
+        const groupId = $(this).attr('data-chid') || $(this).attr('data-grid');
         setActiveCharacter(null);
         setActiveGroup(groupId);
         saveSettingsDebounced();

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

     const template = $('#group_list_template .group_select').clone();
     template.data('id', group.id);
-    template.attr('grid', group.id);
+    template.attr('data-grid', group.id);
     template.find('.ch_name').text(group.name).attr('title', `[Group] ${group.name}`);
     template.find('.group_fav_icon').css('display', 'none');
     template.addClass(group.fav ? 'is_fav' : '');

     template.data('id', character.avatar);
     template.find('.avatar img').attr({ 'src': avatar, 'title': character.avatar });
     template.find('.ch_name').text(character.name);
-    template.attr('chid', characters.indexOf(character));
+    template.attr('data-chid', characters.indexOf(character));
     template.find('.ch_fav').val(isFav);
     template.toggleClass('is_fav', isFav);

@@ -1641,7 +1641,7 @@ async function onGroupActionClick(event) {
1641	}	1641	}
1642		1642
1643	if (action === 'speak') {	1643	if (action === 'speak') {
1644	const chid = Number(member.attr('chid'));	1644	const chid = Number(member.attr('data-chid'));
1645	if (Number.isInteger(chid)) {	1645	if (Number.isInteger(chid)) {
1646	Generate('normal', { force_chid: chid });	1646	Generate('normal', { force_chid: chid });
1647	}	1647	}

         return;
+    }
-    const chid = characterSelect.attr('chid');
+    const chid = characterSelect.attr('data-chid');
     if (chid === null || chid === undefined) {
         return;

+    }
     $(document).on('click', '.group_select', function () {
-        const groupId = $(this).attr('chid') || $(this).attr('grid') || $(this).data('id');
+        const groupId = $(this).attr('data-chid') || $(this).attr('data-grid');
         openGroupById(groupId);
     });
     $('#rm_group_filter').on('input', filterGroupMembers);

public/scripts/personas.js+2 -2 Viewed

     $('#lock_persona_to_char i.icon').toggleClass('fa-unlock', !hasCharLock);
+}
-async function setChatLockedPersona() {
+async function loadPersonaForCurrentChat() {
     // Cache persona list to check if they exist
     const userAvatars = await getUserAvatars(false);

@@ -1484,6 +1484,6 @@ export function initPersonas() {
1484	convertCharacterToPersona();	1484	convertCharacterToPersona();
1485	}	1485	}
1486	});	1486	});
1487	eventSource.on(event_types.CHAT_CHANGED, setChatLockedPersona);	1487	eventSource.on(event_types.CHAT_CHANGED, loadPersonaForCurrentChat);
1488	switchPersonaGridView();	1488	switchPersonaGridView();
1489	}	1489	}

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

+    }
     // Start with the given element and traverse up the DOM tree
     while (element.length && element.parent().length) {
-        const grid = element.attr('grid');
+        const grid = element.attr('data-grid');
-        const chid = element.attr('chid');
+        const chid = element.attr('data-chid');
         if (grid || chid) {
             const id = grid || chid;
             return getTagKeyForEntity(id);

public/scripts/world-info.js+3 -3 Viewed

+    }
     if (characters[chid]?.data?.character_book) {
-        $('#import_character_info').data('chid', chid).show();
+        $('#import_character_info').data('data-chid', chid).show();
         // Only show the alert once per character
         const checkKey = `AlertWI_${characters[chid].avatar}`;

+}
 export async function importEmbeddedWorldInfo(skipPopup = false) {
-    const chid = $('#import_character_info').data('chid');
+    const chid = $('#import_character_info').data('data-chid');
     if (chid === undefined) {
         return;

     });
     $('#world_button').on('click', async function (event) {
-        const chid = $('#set_character_world').data('chid');
+        const chid = $('#set_character_world').data('data-chid');
         if (chid) {
             const worldName = characters[chid]?.data?.extensions?.world;

Refactor chid/grid attributes to data attributes - We don't believe in imaginary HTML attributes that we make up, right?