Merge branch 'master' into improved-hr-conflict-test

5 files changed, 42 insertions, 7 deletions

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 17bf2000..2fb87cd5 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -5,12 +5,10 @@ function setupExtraNetworksForTab(tabname){
     var tabs = gradioApp().querySelector('#'+tabname+'_extra_tabs > div')

     var search = gradioApp().querySelector('#'+tabname+'_extra_search textarea')

     var refresh = gradioApp().getElementById(tabname+'_extra_refresh')

-    var close = gradioApp().getElementById(tabname+'_extra_close')

 

     search.classList.add('search')

     tabs.appendChild(search)

     tabs.appendChild(refresh)

-    tabs.appendChild(close)

 

     search.addEventListener("input", function(evt){

         searchTerm = search.value.toLowerCase()

@@ -78,7 +76,7 @@ function cardClicked(tabname, textToAdd, allowNegativePrompt){
     var textarea = allowNegativePrompt ? activePromptTextarea[tabname] : gradioApp().querySelector("#" + tabname + "_prompt > label > textarea")

 

     if(! tryToRemoveExtraNetworkFromPrompt(textarea, textToAdd)){

-        textarea.value = textarea.value + " " + textToAdd

+        textarea.value = textarea.value + opts.extra_networks_add_text_separator + textToAdd

     }

 

     updateInput(textarea)

@@ -104,4 +102,40 @@ function extraNetworksSearchButton(tabs_id, event){
 

     searchTextarea.value = text

     updateInput(searchTextarea)

-}
\ No newline at end of file
+}

+

+var globalPopup = null;

+var globalPopupInner = null;

+function popup(contents){

+    if(! globalPopup){

+        globalPopup = document.createElement('div')

+        globalPopup.onclick = function(){ globalPopup.style.display = "none"; };

+        globalPopup.classList.add('global-popup');

+

+        var close = document.createElement('div')

+        close.classList.add('global-popup-close');

+        close.onclick = function(){ globalPopup.style.display = "none"; };

+        close.title = "Close";

+        globalPopup.appendChild(close)

+

+        globalPopupInner = document.createElement('div')

+        globalPopupInner.onclick = function(event){ event.stopPropagation(); return false; };

+        globalPopupInner.classList.add('global-popup-inner');

+        globalPopup.appendChild(globalPopupInner)

+

+        gradioApp().appendChild(globalPopup);

+    }

+

+    globalPopupInner.innerHTML = '';

+    globalPopupInner.appendChild(contents);

+

+    globalPopup.style.display = "flex";

+}

+

+function extraNetworksShowMetadata(text){

+    elem = document.createElement('pre')

+    elem.classList.add('popup-metadata');

+    elem.textContent = text;

+

+    popup(elem);

+}

diff --git a/javascript/hints.js b/javascript/hints.js
index f1199009..7f4101b2 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -6,6 +6,7 @@ titles = {
 	"GFPGAN": "Restore low quality faces using GFPGAN neural network",
 	"Euler a": "Euler Ancestral - very creative, each can get a completely different picture depending on step count, setting steps higher than 30-40 does not help",
 	"DDIM": "Denoising Diffusion Implicit Models - best at inpainting",
+	"UniPC": "Unified Predictor-Corrector Framework for Fast Sampling of Diffusion Models",
 	"DPM adaptive": "Ignores step count - uses a number of steps determined by the CFG and resolution", 
 
 	"Batch count": "How many batches of images to create (has no impact on generation performance or VRAM usage)",
diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js
index aac2ee82..28e748b7 100644
--- a/javascript/imageviewer.js
+++ b/javascript/imageviewer.js
@@ -11,7 +11,7 @@ function showModal(event) {
     if (modalImage.style.display === 'none') {
         lb.style.setProperty('background-image', 'url(' + source.src + ')');
     }
-    lb.style.display = "block";
+    lb.style.display = "flex";
     lb.focus()
 
     const tabTxt2Img = gradioApp().getElementById("tab_txt2img")
diff --git a/javascript/notification.js b/javascript/notification.js
index 040a3afa..5ae6df24 100644
--- a/javascript/notification.js
+++ b/javascript/notification.js
@@ -15,7 +15,7 @@ onUiUpdate(function(){
         }
     }
 
-    const galleryPreviews = gradioApp().querySelectorAll('div[id^="tab_"][style*="display: block"] img.h-full.w-full.overflow-hidden');
+    const galleryPreviews = gradioApp().querySelectorAll('div[id^="tab_"][style*="display: block"] div[id$="_results"] img.h-full.w-full.overflow-hidden');
 
     if (galleryPreviews == null) return;
 
diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index ff6d757b..9ccc9da4 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -139,7 +139,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
 
     var divProgress = document.createElement('div')
     divProgress.className='progressDiv'
-    divProgress.style.display = opts.show_progressbar ? "" : "none"
+    divProgress.style.display = opts.show_progressbar ? "block" : "none"
     var divInner = document.createElement('div')
     divInner.className='progress'