From 8e3ced73a8c8f435809de544e0574da265177289 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Mon, 20 Mar 2023 18:04:22 -0600
Subject: Add event.stopPropagation() to extraNetworksShowMetadata()

Prevent bubbling the same way "replace preview" does
---
 javascript/extraNetworks.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'javascript/extraNetworks.js')

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 2fb87cd5..c46ab1c6 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -132,10 +132,12 @@ function popup(contents){
     globalPopup.style.display = "flex";
 }
 
-function extraNetworksShowMetadata(text){
+function extraNetworksShowMetadata(event, text){
     elem = document.createElement('pre')
     elem.classList.add('popup-metadata');
     elem.textContent = text;
 
     popup(elem);
+    
+    event.stopPropagation()
 }
-- 
cgit v1.2.3


From 9ed04e759d8b4a84db1f0e37abee59178fe1f586 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 25 Mar 2023 10:11:04 +0300
Subject: use HTTP request to fetch metadata for Lora cards instead of
 including it into the main page

---
 javascript/extraNetworks.js | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'javascript/extraNetworks.js')

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 2fb87cd5..40818bb4 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -139,3 +139,39 @@ function extraNetworksShowMetadata(text){
 
     popup(elem);
 }
+
+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) {
+                try {
+                    var js = JSON.parse(xhr.responseText);
+                    handler(js)
+                } catch (error) {
+                    console.error(error);
+                    errorHandler()
+                }
+            } else{
+                errorHandler()
+            }
+        }
+    };
+    var js = JSON.stringify(data);
+    xhr.send(js);
+}
+
+function extraNetworksRequestMetadata(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)
+}
-- 
cgit v1.2.3


From b7c14ed041e645d847e0021c08f56b673211482d Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 25 Mar 2023 12:10:03 +0300
Subject: final part of merging #8749

---
 javascript/extraNetworks.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'javascript/extraNetworks.js')

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 742a3c2d..25322138 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -132,14 +132,12 @@ function popup(contents){
     globalPopup.style.display = "flex";
 }
 
-function extraNetworksShowMetadata(event, text){
+function extraNetworksShowMetadata(text){
     elem = document.createElement('pre')
     elem.classList.add('popup-metadata');
     elem.textContent = text;
 
     popup(elem);
-    
-    event.stopPropagation()
 }
 
 function requestGet(url, data, handler, errorHandler){
@@ -166,7 +164,7 @@ function requestGet(url, data, handler, errorHandler){
     xhr.send(js);
 }
 
-function extraNetworksRequestMetadata(extraPage, cardName){
+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){
@@ -176,4 +174,6 @@ function extraNetworksRequestMetadata(extraPage, cardName){
             showError()
         }
     }, showError)
+
+    event.stopPropagation()
 }
-- 
cgit v1.2.3