Merge branch 'master' into patch-6

1 files changed, 15 insertions, 7 deletions

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 065f259b..20b4dc62 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -1,27 +1,33 @@
 // code related to showing and updating progressbar shown as the image is being made
-
 global_progressbar = null
 
 onUiUpdate(function(){
-	progressbar = gradioApp().getElementById('progressbar')
+    progressbar = gradioApp().getElementById('progressbar')
+    progressDiv = gradioApp().querySelectorAll('.progressDiv').length > 0;
+    interrupt = gradioApp().getElementById('interrupt')
 	if(progressbar!= null && progressbar != global_progressbar){
 	    global_progressbar = progressbar
 
         var mutationObserver = new MutationObserver(function(m){
             txt2img_preview = gradioApp().getElementById('txt2img_preview')
             txt2img_gallery = gradioApp().getElementById('txt2img_gallery')
-
             img2img_preview = gradioApp().getElementById('img2img_preview')
             img2img_gallery = gradioApp().getElementById('img2img_gallery')
 
             if(txt2img_preview != null && txt2img_gallery != null){
                 txt2img_preview.style.width = txt2img_gallery.clientWidth + "px"
-                txt2img_preview.style.height = txt2img_gallery.clientHeight + "px"
+                txt2img_preview.style.height = txt2img_gallery.clientHeight + "px"  
+                if(!progressDiv){
+                    interrupt.style.display = "none"
+                }
             }
 
             if(img2img_preview != null && img2img_gallery != null){
                 img2img_preview.style.width = img2img_gallery.clientWidth + "px"
-                img2img_preview.style.height = img2img_gallery.clientHeight + "px"
+                img2img_preview.style.height = img2img_gallery.clientHeight + "px" 
+                if(!progressDiv){
+                    interrupt.style.display = "none"
+                }
             }
 
             window.setTimeout(requestMoreProgress, 500)
@@ -29,12 +35,15 @@ onUiUpdate(function(){
         mutationObserver.observe( progressbar, { childList:true, subtree:true })
 	}
 })
-
 function requestMoreProgress(){
     btn = gradioApp().getElementById("check_progress");
     if(btn==null) return;
 
     btn.click();
+    progressDiv = gradioApp().querySelectorAll('.progressDiv').length > 0;
+    if(progressDiv){
+        interrupt.style.display = "block"
+    }
 }
 
 function requestProgress(){
@@ -43,4 +52,3 @@ function requestProgress(){
 
     btn.click();
 }
-