rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-01 11:56:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into parser-followup-2

Browse Source
This commit is contained in:
LenAnderson 2024-07-19 07:28:41 -04:00
commit 7a99a068e6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/scripts/extensions/stable-diffusion/index.js
View File

@ -2294,14 +2294,13 @@ async function generatePicture(initiator, args, trigger, message, callback) {
let imagePath = ''; let imagePath = '';
const stopListener = () => abortController.abort('Aborted by user'); const stopListener = () => abortController.abort('Aborted by user');
const mesStop = document.getElementById('mes_stop');
try { try {
const combineNegatives = (prefix) => { negativePromptPrefix = combinePrefixes(negativePromptPrefix, prefix); }; const combineNegatives = (prefix) => { negativePromptPrefix = combinePrefixes(negativePromptPrefix, prefix); };
const prompt = await getPrompt(generationType, message, trigger, quietPrompt, combineNegatives); const prompt = await getPrompt(generationType, message, trigger, quietPrompt, combineNegatives);
console.log('Processed image prompt:', prompt); console.log('Processed image prompt:', prompt);
mesStop?.addEventListener('click', stopListener); eventSource.once(event_types.GENERATION_STOPPED, stopListener);
context.deactivateSendButtons(); context.deactivateSendButtons();
hideSwipeButtons(); hideSwipeButtons();
@ -2316,7 +2315,7 @@ async function generatePicture(initiator, args, trigger, message, callback) {
} }
finally { finally {
restoreOriginalDimensions(dimensions); restoreOriginalDimensions(dimensions);
mesStop?.removeEventListener('click', stopListener); eventSource.removeListener(event_types.GENERATION_STOPPED, stopListener);
context.activateSendButtons(); context.activateSendButtons();
showSwipeButtons(); showSwipeButtons();
} }

6
public/scripts/world-info.js
View File

@ -2875,12 +2875,12 @@ function getWorldEntry(name, data, entry) {
}); });
const entryState = function () { const entryState = function () {
if (entry.constant === true) { if (entry.disable === true) {
return 'disabled';
} else if (entry.constant === true) {
return 'constant'; return 'constant';
} else if (entry.vectorized === true) { } else if (entry.vectorized === true) {
return 'vectorized'; return 'vectorized';
} else if (entry.disable === true) {
return 'disabled';
} else { } else {
return 'normal'; return 'normal';
} }