fix extra networks

javascript/extraNetworks.js

@@ -1,22 +1,17 @@
-
 function setupExtraNetworksForTab(tabname){
     gradioApp().querySelector('#'+tabname+'_extra_tabs').classList.add('extra-networks')
-
     var tabs = gradioApp().querySelector('#'+tabname+'_extra_tabs > div')
     var search = gradioApp().querySelector('#'+tabname+'_extra_search textarea')
     var refresh = gradioApp().getElementById(tabname+'_extra_refresh')
     var descriptInput = gradioApp().getElementById(tabname+ '_description_input')
     var close = gradioApp().getElementById(tabname+'_extra_close')
-
     search.classList.add('search')
     tabs.appendChild(search)
     tabs.appendChild(refresh)
     tabs.appendChild(close)
     tabs.appendChild(descriptInput)
-
     search.addEventListener("input", function(evt){
         searchTerm = search.value.toLowerCase()
-
         gradioApp().querySelectorAll('#'+tabname+'_extra_tabs div.card').forEach(function(elem){
             text = elem.querySelector('.name').textContent.toLowerCase() + " " + elem.querySelector('.search_term').textContent.toLowerCase()
             elem.style.display = text.indexOf(searchTerm) == -1 ? "none" : ""
@@ -29,19 +24,13 @@ var activePromptTextarea = {};
 function setupExtraNetworks(){
     setupExtraNetworksForTab('txt2img')
     setupExtraNetworksForTab('img2img')
-
     function registerPrompt(tabname, id){
         var textarea = gradioApp().querySelector("#" + id + " > label > textarea");
-
-        if (! activePromptTextarea[tabname]){
-            activePromptTextarea[tabname] = textarea
-        }
-
-		textarea.addEventListener("focus", function(){
+        if ( !activePromptTextarea[tabname]) activePromptTextarea[tabname] = textarea
+        textarea.addEventListener("focus", function(){
             activePromptTextarea[tabname] = textarea;
-		});
+        });
     }
-
     registerPrompt('txt2img', 'txt2img_prompt')
     registerPrompt('txt2img', 'txt2img_neg_prompt')
     registerPrompt('img2img', 'img2img_prompt')
@@ -49,14 +38,12 @@ function setupExtraNetworks(){
 }
 
 onUiLoaded(setupExtraNetworks)
-
 var re_extranet   =    /<([^:]+:[^:]+):[\d\.]+>/;
 var re_extranet_g = /\s+<([^:]+:[^:]+):[\d\.]+>/g;
 
 function tryToRemoveExtraNetworkFromPrompt(textarea, text){
     var m = text.match(re_extranet)
     if(! m) return false
-
     var partToSearch = m[1]
     var replaced = false
     var newTextareaText = textarea.value.replaceAll(re_extranet_g, function(found, index){
@@ -67,34 +54,25 @@ function tryToRemoveExtraNetworkFromPrompt(textarea, text){
         }
         return found;
     })
-
     if(replaced){
         textarea.value = newTextareaText
         return true;
     }
-
     return false
 }
 
 function cardClicked(tabname, textToAdd, allowNegativePrompt){
     var textarea = allowNegativePrompt ? activePromptTextarea[tabname] : gradioApp().querySelector("#" + tabname + "_prompt > label > textarea")
-
-    if(! tryToRemoveExtraNetworkFromPrompt(textarea, textToAdd)){
-        textarea.value = textarea.value + opts.extra_networks_add_text_separator + textToAdd
-    }
-
+    if (!tryToRemoveExtraNetworkFromPrompt(textarea, textToAdd)) textarea.value = textarea.value + opts.extra_networks_add_text_separator + textToAdd
     updateInput(textarea)
 }
 
 function saveCardPreview(event, tabname, filename){
     var textarea = gradioApp().querySelector("#" + tabname + '_preview_filename  > label > textarea')
     var button = gradioApp().getElementById(tabname + '_save_preview')
-
     textarea.value = filename
     updateInput(textarea)
-
     button.click()
-
     event.stopPropagation()
     event.preventDefault()
 }
@@ -103,18 +81,15 @@ function saveCardDescription(event, tabname, filename, descript){
     var textarea = gradioApp().querySelector("#" + tabname + '_description_filename  > label > textarea')
     var button = gradioApp().getElementById(tabname + '_save_description')
     var description = gradioApp().getElementById(tabname+ '_description_input')
-
     textarea.value = filename
     description.value=descript
     updateInput(textarea)
-
     button.click()
-
     event.stopPropagation()
     event.preventDefault()
 }
 
-function readCardDescription(event, tabname, filename, descript){
+function readCardDescription(event, tabname, filename, descript, extraPage, cardName){
     var textarea = gradioApp().querySelector("#" + tabname + '_description_filename  > label > textarea')
     var description_textarea = gradioApp().querySelector("#" + tabname+ '_description_input > label > textarea')
     var button = gradioApp().getElementById(tabname + '_read_description')
@@ -125,16 +100,12 @@ function readCardDescription(event, tabname, filename, descript){
     button.click()
     event.stopPropagation()
     event.preventDefault()
-    requestGet("./sd_extra_networks/metadata", {"page": extraPage, "item": cardName}, (data) => {
-        if (data && data.metadata) extraNetworksShowMetadata(data.metadata)
-    }, () => {})
 }
 
 function extraNetworksSearchButton(tabs_id, event){
     searchTextarea = gradioApp().querySelector("#" + tabs_id + ' > div > textarea')
     button = event.target
     text = button.classList.contains("search-all") ? "" : button.textContent.trim()
-
     searchTextarea.value = text
     updateInput(searchTextarea)
 }
@@ -146,39 +117,39 @@ function popup(contents){
         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);
+function readCardMetadata(event, extraPage, cardName){
+    requestGet("./sd_extra_networks/metadata", {"page": extraPage, "item": cardName}, function(data){
+        if (data && data.metadata){
+            elem = document.createElement('pre')
+            elem.classList.add('popup-metadata');
+            elem.textContent = data.metadata;
+            popup(elem);
+        }
+    }, () => {})
+    event.stopPropagation()
+    event.preventDefault()
 }
 
 function requestGet(url, data, handler, errorHandler){
     var xhr = new XMLHttpRequest();
     var args = Object.keys(data).map(function(k){ return encodeURIComponent(k) + '=' + encodeURIComponent(data[k]) }).join('&')
     xhr.open("GET", url + "?" + args, true);
-
     xhr.onreadystatechange = function () {
         if (xhr.readyState === 4) {
             if (xhr.status === 200) {
@@ -197,15 +168,3 @@ function requestGet(url, data, handler, errorHandler){
     var js = JSON.stringify(data);
     xhr.send(js);
 }
-
-function extraNetworksRequestMetadata(event, extraPage, cardName){
-    showError = function(){ extraNetworksShowMetadata("there was an error getting metadata"); }
-    requestGet("./sd_extra_networks/metadata", {"page": extraPage, "item": cardName}, function(data){
-        if(data && data.metadata){
-            extraNetworksShowMetadata(data.metadata)
-        } else{
-            showError()
-        }
-    }, showError)
-    event.stopPropagation()
-}