resolve merge conflicts and swap to dev branch for now

1 files changed, 9 insertions, 9 deletions

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 25322138..c8f6b386 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -10,11 +10,11 @@ function setupExtraNetworksForTab(tabname){
     tabs.appendChild(search)

     tabs.appendChild(refresh)

 

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

-        searchTerm = search.value.toLowerCase()

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

+        var 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()

+            var text = elem.querySelector('.name').textContent.toLowerCase() + " " + elem.querySelector('.search_term').textContent.toLowerCase()

             elem.style.display = text.indexOf(searchTerm) == -1 ? "none" : ""

         })

     });

@@ -55,7 +55,7 @@ function tryToRemoveExtraNetworkFromPrompt(textarea, text){
 

     var partToSearch = m[1]

     var replaced = false

-    var newTextareaText = textarea.value.replaceAll(re_extranet_g, function(found, index){

+    var newTextareaText = textarea.value.replaceAll(re_extranet_g, function(found){

         m = found.match(re_extranet);

         if(m[1] == partToSearch){

             replaced = true;

@@ -96,9 +96,9 @@ function saveCardPreview(event, tabname, filename){
 }

 

 function extraNetworksSearchButton(tabs_id, event){

-    searchTextarea = gradioApp().querySelector("#" + tabs_id + ' > div > textarea')

-    button = event.target

-    text = button.classList.contains("search-all") ? "" : button.textContent.trim()

+    var searchTextarea = gradioApp().querySelector("#" + tabs_id + ' > div > textarea')

+    var button = event.target

+    var text = button.classList.contains("search-all") ? "" : button.textContent.trim()

 

     searchTextarea.value = text

     updateInput(searchTextarea)

@@ -133,7 +133,7 @@ function popup(contents){
 }

 

 function extraNetworksShowMetadata(text){

-    elem = document.createElement('pre')

+    var elem = document.createElement('pre')

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

     elem.textContent = text;

 

@@ -165,7 +165,7 @@ function requestGet(url, data, handler, errorHandler){
 }

 

 function extraNetworksRequestMetadata(event, extraPage, cardName){

-    showError = function(){ extraNetworksShowMetadata("there was an error getting metadata"); }

+    var showError = function(){ extraNetworksShowMetadata("there was an error getting metadata"); }

 

     requestGet("./sd_extra_networks/metadata", {"page": extraPage, "item": cardName}, function(data){

         if(data && data.metadata){