From 4e1441c07ecffcb625eaa8f3b035b1c283df1589 Mon Sep 17 00:00:00 2001 From: MoonRide303 Date: Mon, 16 Oct 2023 12:12:49 +0200 Subject: [PATCH] Simplified stopping generate forever --- javascript/contextMenus.js | 13 ++++++------- webui.py | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/javascript/contextMenus.js b/javascript/contextMenus.js index cf76993..983be6a 100644 --- a/javascript/contextMenus.js +++ b/javascript/contextMenus.js @@ -130,6 +130,10 @@ var appendContextMenuOption = initResponse[0]; var removeContextMenuOption = initResponse[1]; var addContextMenuEventListener = initResponse[2]; +let cancelGenerateForever = function() { + clearInterval(window.generateOnRepeatInterval); +}; + (function() { //Start example Context Menu Items let generateOnRepeat = function(genbuttonid, interruptbuttonid) { @@ -154,13 +158,8 @@ var addContextMenuEventListener = initResponse[2]; appendContextMenuOption('#generate_button', 'Generate forever', generateOnRepeatForButtons); appendContextMenuOption('#stop_button', 'Generate forever', generateOnRepeatForButtons); - let cancelGenerateForever = function() { - clearInterval(window.generateOnRepeatInterval); - }; - - appendContextMenuOption('#stop_button', 'Cancel generate forever', cancelGenerateForever); - appendContextMenuOption('#generate_button', 'Cancel generate forever', cancelGenerateForever); - +// appendContextMenuOption('#stop_button', 'Cancel generate forever', cancelGenerateForever); +// appendContextMenuOption('#generate_button', 'Cancel generate forever', cancelGenerateForever); })(); //End example Context Menu Items diff --git a/webui.py b/webui.py index 908ae68..77ac42a 100644 --- a/webui.py +++ b/webui.py @@ -83,7 +83,7 @@ with shared.gradio_root: model_management.interrupt_current_processing() return - stop_button.click(stop_clicked, outputs=[skip_button, stop_button], queue=False) + stop_button.click(stop_clicked, outputs=[skip_button, stop_button], queue=False, _js='cancelGenerateForever') skip_button.click(skip_clicked, queue=False) with gr.Row(elem_classes='advanced_check_row'): input_image_checkbox = gr.Checkbox(label='Input Image', value=False, container=False, elem_classes='min_check')