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

replace jQuery's trigger('input') on #send_textarea with native events because jQuery does not dispatch the native event

Browse Source
This commit is contained in:
LenAnderson
2024-04-23 10:59:59 -04:00
parent 6dc5337952
commit 86806aa2ac
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/script.js
View File

@ -2406,7 +2406,7 @@ async function processCommands(message) {
const currentText = String($('#send_textarea').val()); const currentText = String($('#send_textarea').val());
if (previousText === currentText) { if (previousText === currentText) {
$('#send_textarea').val(result.newText).trigger('input'); $('#send_textarea').val(result.newText)[0].dispatchEvent(new Event('input', { bubbles:true }));
} }
// interrupt generation if the input was nothing but a command // interrupt generation if the input was nothing but a command
@ -2690,7 +2690,7 @@ class StreamingProcessor {
let messageId = -1; let messageId = -1;
if (this.type == 'impersonate') { if (this.type == 'impersonate') {
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
} }
else { else {
await saveReply(this.type, text, true); await saveReply(this.type, text, true);
@ -2726,7 +2726,7 @@ class StreamingProcessor {
} }
if (isImpersonate) { if (isImpersonate) {
$('#send_textarea').val(processedText).trigger('input'); $('#send_textarea').val(processedText)[0].dispatchEvent(new Event('input', { bubbles:true }));
} }
else { else {
let currentTime = new Date(); let currentTime = new Date();
@ -3073,7 +3073,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
const interruptedByCommand = await processCommands(String($('#send_textarea').val())); const interruptedByCommand = await processCommands(String($('#send_textarea').val()));
if (interruptedByCommand) { if (interruptedByCommand) {
//$("#send_textarea").val('').trigger('input'); //$("#send_textarea").val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
unblockGeneration(type); unblockGeneration(type);
return Promise.resolve(); return Promise.resolve();
} }
@ -3159,7 +3159,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
if (type !== 'regenerate' && type !== 'swipe' && type !== 'quiet' && !isImpersonate && !dryRun) { if (type !== 'regenerate' && type !== 'swipe' && type !== 'quiet' && !isImpersonate && !dryRun) {
is_send_press = true; is_send_press = true;
textareaText = String($('#send_textarea').val()); textareaText = String($('#send_textarea').val());
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
} else { } else {
textareaText = ''; textareaText = '';
if (chat.length && chat[chat.length - 1]['is_user']) { if (chat.length && chat[chat.length - 1]['is_user']) {
@ -4094,7 +4094,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
if (getMessage.length > 0) { if (getMessage.length > 0) {
if (isImpersonate) { if (isImpersonate) {
$('#send_textarea').val(getMessage).trigger('input'); $('#send_textarea').val(getMessage)[0].dispatchEvent(new Event('input', { bubbles:true }));
generatedPromptCache = ''; generatedPromptCache = '';
await eventSource.emit(event_types.IMPERSONATE_READY, getMessage); await eventSource.emit(event_types.IMPERSONATE_READY, getMessage);
} }

2
public/scripts/RossAscends-mods.js
View File

@ -422,7 +422,7 @@ function restoreUserInput() {
const userInput = LoadLocal('userInput'); const userInput = LoadLocal('userInput');
if (userInput) { if (userInput) {
$('#send_textarea').val(userInput).trigger('input'); $('#send_textarea').val(userInput)[0].dispatchEvent(new Event('input', { bubbles:true }));
} }
} }

2
public/scripts/group-chats.js
View File

@ -804,7 +804,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
const bias = getBiasStrings(userInput, type); const bias = getBiasStrings(userInput, type);
await sendMessageAsUser(userInput, bias.messageBias); await sendMessageAsUser(userInput, bias.messageBias);
await saveChatConditional(); await saveChatConditional();
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
} }
// now the real generation begins: cycle through every activated character // now the real generation begins: cycle through every activated character

16
public/scripts/slash-commands.js
View File

@ -236,7 +236,7 @@ export function processChatSlashCommands() {
} }
function setInputCallback(_, value) { function setInputCallback(_, value) {
$('#send_textarea').val(value || '').trigger('input'); $('#send_textarea').val(value || '')[0].dispatchEvent(new Event('input', { bubbles:true }));
return value; return value;
} }
@ -422,7 +422,7 @@ async function runCallback(args, name) {
} }
function abortCallback() { function abortCallback() {
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
throw new Error('/abort command executed'); throw new Error('/abort command executed');
} }
@ -540,7 +540,7 @@ async function generateRawCallback(args, value) {
} }
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
const lock = isTrueBoolean(args?.lock); const lock = isTrueBoolean(args?.lock);
const as = args?.as || 'system'; const as = args?.as || 'system';
const quietToLoud = as === 'char'; const quietToLoud = as === 'char';
@ -570,7 +570,7 @@ async function generateCallback(args, value) {
} }
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
const lock = isTrueBoolean(args?.lock); const lock = isTrueBoolean(args?.lock);
const as = args?.as || 'system'; const as = args?.as || 'system';
const quietToLoud = as === 'char'; const quietToLoud = as === 'char';
@ -706,7 +706,7 @@ async function deleteSwipeCallback(_, arg) {
async function askCharacter(_, text) { async function askCharacter(_, text) {
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
// Not supported in group chats // Not supported in group chats
// TODO: Maybe support group chats? // TODO: Maybe support group chats?
@ -1017,7 +1017,7 @@ async function triggerGenerationCallback(args, value) {
} }
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
let chid = undefined; let chid = undefined;
@ -1157,7 +1157,7 @@ function continueChatCallback(_, prompt) {
} }
// Prevent infinite recursion // Prevent infinite recursion
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
$('#option_continue').trigger('click', { fromSlashCommand: true, additionalPrompt: prompt }); $('#option_continue').trigger('click', { fromSlashCommand: true, additionalPrompt: prompt });
}, 1); }, 1);
@ -1165,7 +1165,7 @@ function continueChatCallback(_, prompt) {
} }
export async function generateSystemMessage(_, prompt) { export async function generateSystemMessage(_, prompt) {
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles:true }));
if (!prompt) { if (!prompt) {
console.warn('WARN: No prompt provided for /sysgen command'); console.warn('WARN: No prompt provided for /sysgen command');