Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into upstream-master

1 files changed, 3 insertions, 1 deletions

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 513d9a1c..b24f1a80 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -10,7 +10,6 @@ from modules.processing import Processed, process_images
 from PIL import Image

 from modules.shared import opts, cmd_opts, state

 

-

 class Script(scripts.Script):

     def title(self):

         return "Prompts from file or textbox"

@@ -29,6 +28,9 @@ class Script(scripts.Script):
         checkbox_txt.change(fn=lambda x: [gr.File.update(visible = not x), gr.TextArea.update(visible = x)], inputs=[checkbox_txt], outputs=[file, prompt_txt])

         return [checkbox_txt, file, prompt_txt]

 

+    def on_show(self, checkbox_txt, file, prompt_txt):

+        return [ gr.Checkbox.update(visible = True), gr.File.update(visible = not checkbox_txt), gr.TextArea.update(visible = checkbox_txt) ]

+

     def run(self, p, checkbox_txt, data: bytes, prompt_txt: str):

         if (checkbox_txt):

             lines = [x.strip() for x in prompt_txt.splitlines()]