From 1603418243cab104cb1e13545f12252089f8c936 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 27 Feb 2024 09:30:51 -0500 Subject: [PATCH] add submit function to negative prompt --- javascript/ui.js | 10 +++++----- modules/ui_img2img.py | 5 +++-- modules/ui_txt2img.py | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/javascript/ui.js b/javascript/ui.js index 8edfba11b..4d61d7566 100644 --- a/javascript/ui.js +++ b/javascript/ui.js @@ -241,11 +241,11 @@ function clearPrompts(prompt, negative_prompt) { return [prompt, negative_prompt]; } -const promptTokecountUpdateFuncs = {}; +const promptTokenCountUpdateFuncs = {}; function recalculatePromptTokens(name) { - if (promptTokecountUpdateFuncs[name]) { - promptTokecountUpdateFuncs[name](); + if (promptTokenCountUpdateFuncs[name]) { + promptTokenCountUpdateFuncs[name](); } } @@ -330,8 +330,8 @@ onAfterUiUpdate(async () => { if (counter.parentElement === prompt.parentElement) return; prompt.parentElement.insertBefore(counter, prompt); prompt.parentElement.style.position = 'relative'; - promptTokecountUpdateFuncs[id] = () => { update_token_counter(id_button); }; - localTextarea.addEventListener('input', promptTokecountUpdateFuncs[id]); + promptTokenCountUpdateFuncs[id] = () => { update_token_counter(id_button); }; + localTextarea.addEventListener('input', promptTokenCountUpdateFuncs[id]); if (!promptsInitialized) log('initPrompts'); promptsInitialized = true; } diff --git a/modules/ui_img2img.py b/modules/ui_img2img.py index 404c578dc..8defb34eb 100644 --- a/modules/ui_img2img.py +++ b/modules/ui_img2img.py @@ -38,7 +38,7 @@ def create_ui(): modules.scripts.scripts_current = modules.scripts.scripts_img2img modules.scripts.scripts_img2img.initialize_scripts(is_img2img=True) with gr.Blocks(analytics_enabled=False) as _img2img_interface: - img2img_prompt, img2img_prompt_styles, img2img_negative_prompt, submit, img2img_paste, img2img_extra_networks_button, img2img_token_counter, img2img_token_button, img2img_negative_token_counter, img2img_negative_token_button = ui_sections.create_toprow(is_img2img=True, id_part="img2img") + img2img_prompt, img2img_prompt_styles, img2img_negative_prompt, img2img_submit, img2img_paste, img2img_extra_networks_button, img2img_token_counter, img2img_token_button, img2img_negative_token_counter, img2img_negative_token_button = ui_sections.create_toprow(is_img2img=True, id_part="img2img") img2img_prompt_img = gr.File(label="", elem_id="img2img_prompt_image", file_count="single", type="binary", visible=False) with gr.Row(variant='compact', elem_id="img2img_extra_networks", visible=False) as extra_networks_ui: @@ -207,7 +207,8 @@ def create_ui(): show_progress=False, ) img2img_prompt.submit(**img2img_dict) - submit.click(**img2img_dict) + img2img_negative_prompt.submit(**img2img_dict) + img2img_submit.click(**img2img_dict) dummy_component = gr.Textbox(visible=False, value='dummy') interrogate_args = dict( diff --git a/modules/ui_txt2img.py b/modules/ui_txt2img.py index ca6920a77..7a58acbb8 100644 --- a/modules/ui_txt2img.py +++ b/modules/ui_txt2img.py @@ -87,6 +87,7 @@ def create_ui(): show_progress=False, ) txt2img_prompt.submit(**txt2img_dict) + txt2img_negative_prompt.submit(**txt2img_dict) txt2img_submit.click(**txt2img_dict) txt2img_paste_fields = [ # prompt