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 'dev' of https://github.com/Cohee1207/SillyTavern into dev

Browse Source
This commit is contained in:
RossAscends
2023-05-16 22:45:40 +09:00
parent dfa2954f84 bffeb7ee62
commit bc3c739b22
5 changed files with 91 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,9 @@ import {
hideSwipeButtons,
showSwipeButtons,
callPopup,
getRequestHeaders
getRequestHeaders,
event_types,
eventSource
} from "../../../script.js";
import { getApiUrl, getContext, extension_settings, defaultRequestArgs, modules } from "../../extensions.js";
import { stringFormat, initScrollHeight, resetScrollHeight } from "../../utils.js";
@@ -611,6 +613,9 @@ jQuery(async () => {
initScrollHeight($("#sd_negative_prompt"));
})
await loadSettings();
eventSource.on(event_types.EXTRAS_CONNECTED, async () => {
await Promise.all([loadSamplers(), loadModels()]);
});
await loadSettings();
});