Commit f57445f7 authored by AUTOMATIC's avatar AUTOMATIC
Browse files

Merge branch 'release_candidate' into dev

parents 74d249f6 67f5c2ab
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ function submit_img2img(){
}

function restoreProgressTxt2img(x){
    showRestoreProgressButton("txt2img", false)

    id = localStorage.getItem("txt2img_task_id")

    if(id) {
@@ -219,6 +221,8 @@ function restoreProgressTxt2img(x){
    return [id]
}
function restoreProgressImg2img(x){
    showRestoreProgressButton("img2img", false)

    id = localStorage.getItem("img2img_task_id")

    if(id) {
+4 −1
Original line number Diff line number Diff line
@@ -810,7 +810,10 @@ def create_ui():
                                    scale_by.release(**on_change_args)
                                    button_update_resize_to.click(**on_change_args)

                                    for component in img2img_image_inputs:
                                    # the code below is meant to update the resolution label after the image in the image selection UI has changed.
                                    # as it is now the event keeps firing continuously for inpaint edits, which ruins the page with constant requests.
                                    # I assume this must be a gradio bug and for now we'll just do it for non-inpaint inputs.
                                    for component in [init_img, sketch]:
                                        component.change(fn=lambda: None, _js="updateImg2imgResizeToTextAfterChangingImage", inputs=[], outputs=[], show_progress=False)

                            tab_scale_to.select(fn=lambda: 0, inputs=[], outputs=[selected_scale_tab])