extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-06-21 02:18:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
JeLuF 2023-08-14 01:14:06 +02:00
commit 6941c30cbe
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/index.html
View File

@ -520,12 +520,12 @@
<div id="tab-content-gallery" class="tab-content"> <div id="tab-content-gallery" class="tab-content">
<div id="gallery-search"> <div id="gallery-search">
<button class="primaryButton" onclick="decrementGalleryPage()"><i class="fa-solid fa-arrow-left"></i></button> <button class="primaryButton" onclick="decrementGalleryPage()"><i class="fa-solid fa-arrow-left"></i></button>
<textarea id="gallery-prompt-search" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a prompt..."></textarea> <input id="gallery-prompt-search" type="text" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a prompt..."></input>
<textarea id="gallery-model-search" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a model..."></textarea> <input id="gallery-model-search" type="text" onkeydown="gallery_keyDown_handler(event)" placeholder="Search for a model..."></input>
<label for="gallery-page">Page:</label> <label for="gallery-page">Page:</label>
<input id="gallery-page" name="Page" value="0" size="1" onkeypress="gallery_keyDown_handler(event)"> <input id="gallery-page" name="Page" value="0" size="1" onkeypress="gallery_keyDown_handler(event)">
<button class="primaryButton" id="gallery-refresh" onclick="refreshGallery()">Load</button>
<input id="gallery-thumbnail-size" name="gallery-thumbnail-size" class="editor-slider" type="range" value="300" min="50" max="800"> <input id="gallery-thumbnail-size" name="gallery-thumbnail-size" class="editor-slider" type="range" value="300" min="50" max="800">
<button class="primaryButton" id="gallery-refresh" onclick="refreshGallery(true)">Load</button>
<button class="primaryButton" onclick="incrementGalleryPage()"><i class="fa-solid fa-arrow-right"></i></button> <button class="primaryButton" onclick="incrementGalleryPage()"><i class="fa-solid fa-arrow-right"></i></button>
</div> </div>
<div class="gallery"> <div class="gallery">

14
ui/media/js/main.js
View File

@ -3254,8 +3254,10 @@ function layoutGallery() {
}) })
} }
function refreshGallery(newsearch = false) {
function refreshGallery() { if (newsearch) {
document.getElementById("gallery-page").value = 0
}
let container = document.getElementById("imagecontainer") let container = document.getElementById("imagecontainer")
container.innerHTML = "" container.innerHTML = ""
let params = new URLSearchParams({ let params = new URLSearchParams({
@ -3278,7 +3280,9 @@ function refreshGallery() {
// Wait for all images to be loaded // Wait for all images to be loaded
Promise.all(Array.from(container.querySelectorAll("img")).map(img => { Promise.all(Array.from(container.querySelectorAll("img")).map(img => {
if (img.complete) if (img.complete)
{
return Promise.resolve(img.naturalHeight !== 0) return Promise.resolve(img.naturalHeight !== 0)
}
return new Promise(resolve => { return new Promise(resolve => {
img.addEventListener('load', () => resolve(true)) img.addEventListener('load', () => resolve(true))
img.addEventListener('error', () => resolve(false)) img.addEventListener('error', () => resolve(false))
@ -3301,17 +3305,17 @@ document.addEventListener("tabClick", (e) => {
function decrementGalleryPage() { function decrementGalleryPage() {
let page = Math.max(document.getElementById("gallery-page").value - 1, 0) let page = Math.max(document.getElementById("gallery-page").value - 1, 0)
document.getElementById("gallery-page").value = page document.getElementById("gallery-page").value = page
refreshGallery() refreshGallery(false)
} }
function incrementGalleryPage() { function incrementGalleryPage() {
document.getElementById("gallery-page").value++ document.getElementById("gallery-page").value++
refreshGallery() refreshGallery(false)
} }
function gallery_keyDown_handler(event) { function gallery_keyDown_handler(event) {
if (event.key === 'Enter') { if (event.key === 'Enter') {
event.preventDefault() event.preventDefault()
refreshGallery() refreshGallery(true)
} }
} }