diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py index dad4500e7..8cbcbe9d3 100644 --- a/extensions-builtin/Lora/ui_extra_networks_lora.py +++ b/extensions-builtin/Lora/ui_extra_networks_lora.py @@ -22,9 +22,11 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage): "preview": self.find_preview(path), "description": self.find_description(path), "search_term": self.search_terms_from_path(lora_on_disk.filename), - "prompt": json.dumps(f""), + + " + " + json.dumps(">") + ), "local_preview": f"{path}.{shared.opts.samples_format}", "metadata": json.dumps(lora_on_disk.metadata, indent=4) if lora_on_disk.metadata else None, } diff --git a/javascript/prompt-bracket-checker.js b/javascript/prompt-bracket-checker.js index 114cf94cc..444c676aa 100644 --- a/javascript/prompt-bracket-checker.js +++ b/javascript/prompt-bracket-checker.js @@ -34,7 +34,7 @@ function setupBracketChecking(id_prompt, id_counter) { } } -onUiLoaded(function() { +onAfterUiUpdate(function() { setupBracketChecking('txt2img_prompt', 'txt2img_token_counter'); setupBracketChecking('txt2img_neg_prompt', 'txt2img_negative_token_counter'); setupBracketChecking('img2img_prompt', 'img2img_token_counter'); diff --git a/javascript/script.js b/javascript/script.js index 9b07a40c1..ccf5767bb 100644 --- a/javascript/script.js +++ b/javascript/script.js @@ -42,7 +42,7 @@ function onOptionsChanged(callback) { } function executeCallbacks(queue, arg) { - if (!uiLoaded) return + // if (!uiLoaded) return for (const callback of queue) { try { callback(arg); diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 929f671c5..80e7a9e7e 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -112,8 +112,7 @@ class ExtraNetworksPage: subdirs_html = "".join([f""" - """ for subdir in subdirs]) + """ for subdir in subdirs]) try: self.items = list(self.list_items()) self.create_xyz_grid() @@ -232,20 +231,20 @@ def create_ui(container, button, tabname): ui.stored_extra_pages = pages_in_preferred_order(extra_pages.copy()) ui.tabname = tabname with gr.Tabs(elem_id=tabname+"_extra_tabs"): + ui.search = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=True) + ui.description_input = gr.TextArea('', show_label=False, elem_id=tabname+"_description_input", placeholder="Save/Replace Extra Network Description...", lines=2) + button_refresh = ToolButton(refresh_symbol, elem_id=tabname+"_extra_refresh") + button_close = ToolButton(close_symbol, elem_id=tabname+"_extra_close") for page in ui.stored_extra_pages: + ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False) + ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False) + ui.button_save_description = gr.Button('Save description', elem_id=tabname+"_save_description", visible=False) + ui.button_read_description = gr.Button('Read description', elem_id=tabname+"_read_description", visible=False) + ui.description_target_filename = gr.Textbox('Description save filename', elem_id=tabname+"_description_filename", visible=False) with gr.Tab(page.title, id=page.title.lower().replace(" ", "_")): page_elem = gr.HTML(page.create_html(ui.tabname)) page_elem.change(fn=lambda: None, _js=f'() => refreshExtraNetworks("{tabname}")', inputs=[], outputs=[]) ui.pages.append(page_elem) - ui.search = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False) - ui.description_input = gr.TextArea('', show_label=False, elem_id=tabname+"_description_input", placeholder="Save/Replace Extra Network Description...", lines=2) - button_refresh = ToolButton(refresh_symbol, elem_id=tabname+"_extra_refresh") - button_close = ToolButton(close_symbol, elem_id=tabname+"_extra_close") - ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False) - ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False) - ui.button_save_description = gr.Button('Save description', elem_id=tabname+"_save_description", visible=False) - ui.button_read_description = gr.Button('Read description', elem_id=tabname+"_read_description", visible=False) - ui.description_target_filename = gr.Textbox('Description save filename', elem_id=tabname+"_description_filename", visible=False) def toggle_visibility(is_visible): is_visible = not is_visible