Merge branch 'dev' into test-fp8

1 files changed, 11 insertions, 3 deletions

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index f03e2033..fe5d3ba3 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -151,8 +151,13 @@ class ExtraNetworksPage:
                         continue

 

                     subdir = os.path.abspath(x)[len(parentdir):].replace("\\", "/")

-                    while subdir.startswith("/"):

-                        subdir = subdir[1:]

+

+                    if shared.opts.extra_networks_dir_button_function:

+                        if not subdir.startswith("/"):

+                            subdir = "/" + subdir

+                    else:

+                        while subdir.startswith("/"):

+                            subdir = subdir[1:]

 

                     is_empty = len(os.listdir(x)) == 0

                     if not is_empty and not subdir.endswith("/"):

@@ -370,6 +375,9 @@ def create_ui(interface: gr.Blocks, unrelated_tabs, tabname):
 

     for page in ui.stored_extra_pages:

         with gr.Tab(page.title, elem_id=f"{tabname}_{page.id_page}", elem_classes=["extra-page"]) as tab:

+            with gr.Column(elem_id=f"{tabname}_{page.id_page}_prompts", elem_classes=["extra-page-prompts"]):

+                pass

+

             elem_id = f"{tabname}_{page.id_page}_cards_html"

             page_elem = gr.HTML('Loading...', elem_id=elem_id)

             ui.pages.append(page_elem)

@@ -400,7 +408,7 @@ def create_ui(interface: gr.Blocks, unrelated_tabs, tabname):
         allow_prompt = "true" if page.allow_prompt else "false"

         allow_negative_prompt = "true" if page.allow_negative_prompt else "false"

 

-        jscode = 'extraNetworksTabSelected("' + tabname + '", "' + f"{tabname}_{page.id_page}" + '", ' + allow_prompt + ', ' + allow_negative_prompt + ');'

+        jscode = 'extraNetworksTabSelected("' + tabname + '", "' + f"{tabname}_{page.id_page}_prompts" + '", ' + allow_prompt + ', ' + allow_negative_prompt + ');'

 

         tab.select(fn=lambda: [gr.update(visible=True) for _ in tab_controls],  _js='function(){ ' + jscode + ' }', inputs=[], outputs=tab_controls, show_progress=False)