From 7917ac8ebcfbaaaa729d700ec563e07a93402245 Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sun, 19 Mar 2023 16:21:17 +0100 Subject: [PATCH 1/3] Load prompt: support JSON and TXT metadata Also, allow prompt files (one line per prompt) to be dnd'ed --- ui/media/js/dnd.js | 1 + ui/media/js/main.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js index e3b8cc9f..f1f00911 100644 --- a/ui/media/js/dnd.js +++ b/ui/media/js/dnd.js @@ -490,6 +490,7 @@ async function parseContent(text) { return true } else { console.warn(`Raw text content couldn't be parsed.`) + promptField.value = text return false } } diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 55c42af6..0ba5a336 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -1582,7 +1582,7 @@ promptsFromFileBtn.addEventListener('click', function() { promptsFromFileSelector.click() }) -promptsFromFileSelector.addEventListener('change', function() { +promptsFromFileSelector.addEventListener('change', async function() { if (promptsFromFileSelector.files.length === 0) { return } @@ -1590,8 +1590,8 @@ promptsFromFileSelector.addEventListener('change', function() { let reader = new FileReader() let file = promptsFromFileSelector.files[0] - reader.addEventListener('load', function() { - promptField.value = reader.result + reader.addEventListener('load', async function() { + await parseContent(reader.result) }) if (file) { From bcaa624b9bd0b578e69c3db538ba35834877b652 Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sun, 19 Mar 2023 17:42:08 +0100 Subject: [PATCH 2/3] Prevent collisions of 'What's new' and the server status --- ui/media/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 95b8d5c5..c5e7c251 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -831,7 +831,7 @@ input::file-selector-button { } /* Small screens */ -@media screen and (max-width: 1265px) { +@media screen and (max-width: 1365px) { #top-nav { flex-direction: column; } From c9a05e0290ade18624eceaf80212ee56047ba0be Mon Sep 17 00:00:00 2001 From: JeLuF Date: Mon, 20 Mar 2023 14:52:45 +0100 Subject: [PATCH 3/3] Add 'Karras' tag to DPM samplers --- ui/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/index.html b/ui/index.html index 7112c022..d2b836b1 100644 --- a/ui/index.html +++ b/ui/index.html @@ -154,11 +154,11 @@ - - - - - + + + + +