Fix world info binding and alt.greetings editor for first char in the list Possibly fixes #3579

2df140a6a9ef0cab65db3c7f8a2390a0b56345e0

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

public/script.js+5 -5 Viewed

     $('#renameCharButton').css('display', 'none');
     $('#name_div').removeClass('displayNone');
     $('#name_div').addClass('displayBlock');
-    $('.open_alternate_greetings').data('chid', undefined);
+    $('.open_alternate_greetings').data('chid', -1);
-    $('#set_character_world').data('chid', undefined);
+    $('#set_character_world').data('chid', -1);
     setWorldInfoButtonClass(undefined, !!create_save.world);
     updateFavButtonState(false);
     checkEmbeddedWorld();

 function openCharacterWorldPopup() {
     const chid = $('#set_character_world').data('chid');
-    if (menu_type != 'create' && chid == undefined) {
+    if (menu_type != 'create' && chid === undefined) {
         toastr.error('Does not have an Id for this character in world select menu.');
         return;
+    }

@@ -8380,7 +8380,7 @@ function openAlternateGreetings() {
8380	return;	8380	return;
8381	} else {	8381	} else {
8382	// If the character does not have alternate greetings, create an empty array	8382	// If the character does not have alternate greetings, create an empty array
8383	if (chid && Array.isArray(characters[chid].data.alternate_greetings) == false) {	8383	if (characters[chid] && !Array.isArray(characters[chid].data.alternate_greetings)) {
8384	characters[chid].data.alternate_greetings = [];	8384	characters[chid].data.alternate_greetings = [];
8385	}	8385	}
8386	}	8386	}

             formData.delete('alternate_greetings');
             const chid = $('.open_alternate_greetings').data('chid');
-            if (chid && Array.isArray(characters[chid]?.data?.alternate_greetings)) {
+            if (characters[chid] && Array.isArray(characters[chid]?.data?.alternate_greetings)) {
                 for (const value of characters[chid].data.alternate_greetings) {
                     formData.append('alternate_greetings', value);
+                }

public/scripts/world-info.js+26 -16 Viewed

@@ -4732,7 +4732,7 @@ export function setWorldInfoButtonClass(chid, forceValue = undefined) {
4732	return;	4732	return;
4733	}	4733	}
4734		4734
4735	if (!chid) {	4735	if (chid === undefined) {
4736	return;	4736	return;
4737	}	4737	}
4738		4738

+    }
     if (characters[chid]?.data?.character_book) {
-        $('#import_character_info').data('data-chid', chid).show();
+        $('#import_character_info').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('data-chid');
+    const chid = $('#import_character_info').data('chid');
-    if (chid === undefined) {
+    if (chid === undefined || chid === -1) {
+        return;
+    }
+    const hasEmbed = checkEmbeddedWorld(chid);
+    if (!hasEmbed) {
         return;
+    }

     });
     $('#world_button').on('click', async function (event) {
+        const openSetWorldMenu = () => $('#char-management-dropdown').val($('#set_character_world').val()).trigger('change');
         const chid = $('#set_character_world').data('chid');
-        if (chid) {
+        if (chid === -1) {
-            const worldName = characters[chid]?.data?.extensions?.world;
+            openSetWorldMenu();
-            const hasEmbed = checkEmbeddedWorld(chid);
+            return;
-            if (worldName && world_names.includes(worldName) && !event.shiftKey) {
+        }
-                openWorldInfoEditor(worldName);
-            } else if (hasEmbed && !event.shiftKey) {
+        const worldName = characters[chid]?.data?.extensions?.world;
-                await importEmbeddedWorldInfo();
+        const hasEmbed = checkEmbeddedWorld(chid);
-                saveCharacterDebounced();
+        if (worldName && world_names.includes(worldName) && !event.shiftKey) {
-            }
+            openWorldInfoEditor(worldName);
-            else {
+        } else if (hasEmbed && !event.shiftKey) {
-                $('#char-management-dropdown').val($('#set_character_world').val()).trigger('change');
+            await importEmbeddedWorldInfo();
-            }
+            saveCharacterDebounced();
+        }
+        else {
+            openSetWorldMenu();
+        }
     });