rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into tags-as-folders-enhancements

Browse Source
This commit is contained in:
Wolfsblvt
2024-03-07 16:09:57 +01:00
parent dae90373e7 bb53fef531
commit 7b49290fec
10 changed files with 715 additions and 1085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/script.js
View File

@@ -7204,6 +7204,11 @@ async function createOrEditCharacter(e) {
formData.set('fav', fav_ch_checked);
if ($('#form_create').attr('actiontype') == 'createcharacter') {
if ($('#character_name_pole').val().length > 0) {
if (is_group_generating || is_send_press) {
toastr.error('Cannot create characters while generating. Stop the request and try again.', 'Creation aborted');
throw new Error('Cannot import character while generating');
}
//if the character name text area isn't empty (only posible when creating a new character)
let url = '/api/characters/create';
@@ -7956,6 +7961,11 @@ export async function processDroppedFiles(files, preserveFileNames = false) {
* @returns {Promise<void>}
*/
async function importCharacter(file, preserveFileName = false) {
if (is_group_generating || is_send_press) {
toastr.error('Cannot import characters while generating. Stop the request and try again.', 'Import aborted');
throw new Error('Cannot import character while generating');
}
const ext = file.name.match(/\.(\w+)$/);
if (!ext || !(['json', 'png', 'yaml', 'yml'].includes(ext[1].toLowerCase()))) {
return;