From 64b7e8382377bb578d9740c061979776b214cfd9 Mon Sep 17 00:00:00 2001
From: sumof2primes <sumof2primes@gmail.com>
Date: Wed, 22 Mar 2023 18:24:11 +0900
Subject: Fix scripts load order  - 1st webui, 2nd extensions-builtin, 3rd
 extensions  - to load scripts independent of --data-dir  - change load order
 key [x.basedir, x.filename, x.path] to [orderby(x.basedir), x.filename,
 x.path]

e.g., scripts/xyz_grid.py dependent extentions should loaded later
extensions\sd-webui-controlnet\scripts\xyz_grid_support.py
extensions\sd-webui-additional-networks\scripts\xyz_grid_support.py
---
 modules/scripts.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'modules/scripts.py')

diff --git a/modules/scripts.py b/modules/scripts.py
index 8de19884..935c693c 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -239,7 +239,15 @@ def load_scripts():
             elif issubclass(script_class, scripts_postprocessing.ScriptPostprocessing):
                 postprocessing_scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module))
 
-    for scriptfile in sorted(scripts_list):
+    def orderby(basedir):
+        # 1st webui, 2nd extensions-builtin, 3rd extensions
+        priority = {os.path.join(paths.script_path, "extensions-builtin"):1, paths.script_path:0}
+        for key in priority:
+            if basedir.startswith(key):
+                return priority[key]
+        return 9999
+
+    for scriptfile in sorted(scripts_list, key=lambda x: [orderby(x.basedir), x.filename, x.path]):
         try:
             if scriptfile.basedir != paths.script_path:
                 sys.path = [scriptfile.basedir] + sys.path
-- 
cgit v1.2.3


From cd3cd0fca0f109662e783a55d12c26837254f11f Mon Sep 17 00:00:00 2001
From: sumof2primes <sumof2primes@gmail.com>
Date: Thu, 23 Mar 2023 01:28:09 +0900
Subject: Fix scripts load order  - 1st webui, 2nd extensions-builtin, 3rd
 extensions  - to load scripts independent of --data-dir  - change load order
 key [x.basedir, x.filename, x.path] to [orderby(x.basedir), x.filename,
 x.path]

e.g., scripts/xyz_grid.py dependent extentions should loaded later
extensions\sd-webui-controlnet\scripts\xyz_grid_support.py
extensions\sd-webui-additional-networks\scripts\xyz_grid_support.py
---
 modules/scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/scripts.py')

diff --git a/modules/scripts.py b/modules/scripts.py
index 935c693c..a8d525bf 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -247,7 +247,7 @@ def load_scripts():
                 return priority[key]
         return 9999
 
-    for scriptfile in sorted(scripts_list, key=lambda x: [orderby(x.basedir), x.filename, x.path]):
+    for scriptfile in sorted(scripts_list, key=lambda x: [orderby(x.basedir), x]):
         try:
             if scriptfile.basedir != paths.script_path:
                 sys.path = [scriptfile.basedir] + sys.path
-- 
cgit v1.2.3


From 9f0da9f6edfb9be1d69ba3492a61d96db769307b Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 20 Mar 2023 16:09:36 +0300
Subject: initial gradio 3.22 support

---
 modules/scripts.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/scripts.py')

diff --git a/modules/scripts.py b/modules/scripts.py
index 8de19884..40d8dcc6 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -521,6 +521,9 @@ def IOComponent_init(self, *args, **kwargs):
 
     res = original_IOComponent_init(self, *args, **kwargs)
 
+    # this adds gradio-* to every component for css styling (ie gradio-button to gr.Button)
+    self.elem_classes = ["gradio-" + self.get_block_name(), *(self.elem_classes or [])]
+
     script_callbacks.after_component_callback(self, **kwargs)
 
     if scripts_current is not None:
-- 
cgit v1.2.3


From 43a0912a07376fd045095de0fea54de098b113ef Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 21 Mar 2023 08:18:14 +0300
Subject: hide delete button for single-item dropdown more stylistic changes

---
 modules/scripts.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'modules/scripts.py')

diff --git a/modules/scripts.py b/modules/scripts.py
index 40d8dcc6..8f55cf24 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -513,6 +513,18 @@ def reload_scripts():
     scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
 
 
+def add_classes_to_gradio_component(comp):
+    """
+    this adds gradio-* to the component for css styling (ie gradio-button to gr.Button), as well as some others
+    """
+
+    comp.elem_classes = ["gradio-" + comp.get_block_name(), *(comp.elem_classes or [])]
+
+    if getattr(comp, 'multiselect', False):
+        comp.elem_classes.append('multiselect')
+
+
+
 def IOComponent_init(self, *args, **kwargs):
     if scripts_current is not None:
         scripts_current.before_component(self, **kwargs)
@@ -521,8 +533,7 @@ def IOComponent_init(self, *args, **kwargs):
 
     res = original_IOComponent_init(self, *args, **kwargs)
 
-    # this adds gradio-* to every component for css styling (ie gradio-button to gr.Button)
-    self.elem_classes = ["gradio-" + self.get_block_name(), *(self.elem_classes or [])]
+    add_classes_to_gradio_component(self)
 
     script_callbacks.after_component_callback(self, **kwargs)
 
-- 
cgit v1.2.3