StableDiffusion/WebUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keep randomId simpler

Browse Source
This commit is contained in:
siutin 2023-03-29 00:17:19 +08:00
parent 90366b8d85
commit 70ab21e67d
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
javascript/progressbar.js
View File

@ -59,8 +59,8 @@ function setTitle(progress){
} }
function randomId(prefix=null){ function randomId(){
return "task(" + (prefix == null ? "" : prefix + "_") + Math.random().toString(36).slice(2, 7) + Math.random().toString(36).slice(2, 7) + Math.random().toString(36).slice(2, 7)+")" return "task(" + Math.random().toString(36).slice(2, 7) + Math.random().toString(36).slice(2, 7) + Math.random().toString(36).slice(2, 7)+")"
} }
// starts sending progress requests to "/internal/progress" uri, creating progressbar above progressbarContainer element and // starts sending progress requests to "/internal/progress" uri, creating progressbar above progressbarContainer element and

10
javascript/ui.js
View File

@ -163,7 +163,7 @@ function submit(){
rememberGallerySelection('txt2img_gallery') rememberGallerySelection('txt2img_gallery')
showSubmitButtons('txt2img', false) showSubmitButtons('txt2img', false)
var id = randomId("txt2img") var id = randomId()
requestProgress(id, gradioApp().getElementById('txt2img_gallery_container'), gradioApp().getElementById('txt2img_gallery'), function(){ requestProgress(id, gradioApp().getElementById('txt2img_gallery_container'), gradioApp().getElementById('txt2img_gallery'), function(){
showSubmitButtons('txt2img', true) showSubmitButtons('txt2img', true)
@ -180,7 +180,7 @@ function submit_img2img(){
rememberGallerySelection('img2img_gallery') rememberGallerySelection('img2img_gallery')
showSubmitButtons('img2img', false) showSubmitButtons('img2img', false)
var id = randomId("img2img") var id = randomId()
requestProgress(id, gradioApp().getElementById('img2img_gallery_container'), gradioApp().getElementById('img2img_gallery'), function(){ requestProgress(id, gradioApp().getElementById('img2img_gallery_container'), gradioApp().getElementById('img2img_gallery'), function(){
showSubmitButtons('img2img', true) showSubmitButtons('img2img', true)
}) })
@ -367,12 +367,6 @@ function restoreProgress (task_tag) {
if (task_tag) { if (task_tag) {
let successHandler = ({ current_task }) => { let successHandler = ({ current_task }) => {
if (current_task) { if (current_task) {
let _task_tag = ["txt2img", "img2img"].find(t => current_task.startsWith(`task(${t}_`) && current_task.endsWith(")"))
if (!_task_tag) {
console.warn(`task tag ${current_task} not implemented yet`)
return
}
if (task_tag != _task_tag) return
showSubmitButtons(task_tag, false) showSubmitButtons(task_tag, false)
requestProgress(current_task, gradioApp().getElementById(`${task_tag}_gallery_container`), gradioApp().getElementById(`${task_tag}_gallery`), function(){ requestProgress(current_task, gradioApp().getElementById(`${task_tag}_gallery_container`), gradioApp().getElementById(`${task_tag}_gallery`), function(){
showSubmitButtons(task_tag, true) showSubmitButtons(task_tag, true)

4
modules/progress.py
View File

@ -49,8 +49,8 @@ def set_last_task_result(id_job, result):
last_task_result = result last_task_result = result
def restore_progress_call(task_tag): def restore_progress_call():
if current_task is None or not current_task[5:-1].startswith(task_tag): if current_task is None:
# image, generation_info, html_info, html_log # image, generation_info, html_info, html_log
return tuple(list([None, None, None, None])) return tuple(list([None, None, None, None]))