fix toasts and final char selection

d4f23de003997002d33f99bec8a824177f4a0b73

d-ber <davide.bertalero@studenti.unimi.it>

public/script.js+26 -10 Viewed

     // Set a timeout so multiple flashes don't overlap
     clearTimeout(importFlashTimeout);
     importFlashTimeout = setTimeout(function () {
         if (type === 'char_import' || type === 'char_create' || type === 'char_import_no_toast') {
             // Find the page at which the character is located
             const avatarFileName = charId;
             const charData = getEntitiesList({ doFilter: true });

@@ -8865,7 +8865,10 @@ export async function processDroppedFiles(files, data = new Map()) {
8865	8865	}
8866	8866	}
8867	8867
8868		- await importCharactersTags(avatarFileNames);
	8868	+ if (avatarFileNames.length > 0){
	8869	+ await importCharactersTags(avatarFileNames);
	8870	+ selectImportedChar(avatarFileNames[avatarFileNames.length - 1]);
	8871	+ }
8869	8872	}
8870	8873
8871	8874	/**

+}
 /**
 + * Selects the given imported char
 + * @param {string} charId char to select
 + */
 +function selectImportedChar(charId) {
 +    let oldSelectedChar = null;
 +    if (this_chid !== undefined) {
 +        oldSelectedChar = characters[this_chid].avatar;
 +    }
 +    select_rm_info('char_import_no_toast', charId, oldSelectedChar);
 +}
++
 +/**
  * Imports a character from a file.
  * @param {File} file File to import
  * @param {object} [options] - Options

     if (data.file_name !== undefined) {
         $('#character_search_bar').val('').trigger('input');
 -        let oldSelectedChar = null;
 +        toastr.success(t`Character Created: ${String(data.file_name).replace('.png', '')}`);
 -        if (this_chid !== undefined) {
 -            oldSelectedChar = characters[this_chid].avatar;
 -        }
+-
 -        select_rm_info('char_import', data.file_name, oldSelectedChar);
         let avatarFileName = `${data.file_name}.png`;
         if (importTags) {
             await importCharactersTags([avatarFileName]);
++
 +            selectImportedChar(data.file_name);
+        }
         return avatarFileName;
+    }

                 avatarFileNames.push(avatarFileName);
+            }
+        }
 -        await importCharactersTags(avatarFileNames);
++
 +        if (avatarFileNames.length > 0){
 +            await importCharactersTags(avatarFileNames);
 +            selectImportedChar(avatarFileNames[avatarFileNames.length - 1]);
 +        }
     });
     $('#export_button').on('click', function () {