From d7f48472ccb279c13c5f5d67144b888083feb978 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Tue, 19 Mar 2024 18:50:25 -0600
Subject: [PATCH 1/2] Fix extra networks buttons when filename contains an
 apostrophe

---
 html/extra-networks-copy-path-button.html |  2 +-
 html/extra-networks-edit-item-button.html |  2 +-
 html/extra-networks-metadata-button.html  |  2 +-
 javascript/extraNetworks.js               | 11 +++++++----
 modules/ui_extra_networks.py              |  2 --
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/html/extra-networks-copy-path-button.html b/html/extra-networks-copy-path-button.html
index 8083bb033..50304b42d 100644
--- a/html/extra-networks-copy-path-button.html
+++ b/html/extra-networks-copy-path-button.html
@@ -1,5 +1,5 @@
 <div class="copy-path-button card-button"
     title="Copy path to clipboard"
-    onclick="extraNetworksCopyCardPath(event, '{filename}')"
+    onclick="extraNetworksCopyCardPath(event)"
     data-clipboard-text="{filename}">
 </div>
\ No newline at end of file
diff --git a/html/extra-networks-edit-item-button.html b/html/extra-networks-edit-item-button.html
index 0fe43082a..fd728600f 100644
--- a/html/extra-networks-edit-item-button.html
+++ b/html/extra-networks-edit-item-button.html
@@ -1,4 +1,4 @@
 <div class="edit-button card-button"
     title="Edit metadata"
-    onclick="extraNetworksEditUserMetadata(event, '{tabname}', '{extra_networks_tabname}', '{name}')">
+    onclick="extraNetworksEditUserMetadata(event, '{tabname}', '{extra_networks_tabname}')">
 </div>
\ No newline at end of file
diff --git a/html/extra-networks-metadata-button.html b/html/extra-networks-metadata-button.html
index 285b5b3b6..4ef013bc0 100644
--- a/html/extra-networks-metadata-button.html
+++ b/html/extra-networks-metadata-button.html
@@ -1,4 +1,4 @@
 <div class="metadata-button card-button"
     title="Show internal metadata"
-    onclick="extraNetworksRequestMetadata(event, '{extra_networks_tabname}', '{name}')">
+    onclick="extraNetworksRequestMetadata(event, '{extra_networks_tabname}')">
 </div>
\ No newline at end of file
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index d5855fe96..655193eb7 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -543,16 +543,18 @@ function requestGet(url, data, handler, errorHandler) {
     xhr.send(js);
 }
 
-function extraNetworksCopyCardPath(event, path) {
-    navigator.clipboard.writeText(path);
+function extraNetworksCopyCardPath(event) {
+    navigator.clipboard.writeText(event.target.getAttribute("data-clipboard-text"));
     event.stopPropagation();
 }
 
-function extraNetworksRequestMetadata(event, extraPage, cardName) {
+function extraNetworksRequestMetadata(event, extraPage) {
     var showError = function() {
         extraNetworksShowMetadata("there was an error getting metadata");
     };
 
+    var cardName = event.target.parentElement.parentElement.getAttribute("data-name");
+
     requestGet("./sd_extra_networks/metadata", {page: extraPage, item: cardName}, function(data) {
         if (data && data.metadata) {
             extraNetworksShowMetadata(data.metadata);
@@ -566,7 +568,7 @@ function extraNetworksRequestMetadata(event, extraPage, cardName) {
 
 var extraPageUserMetadataEditors = {};
 
-function extraNetworksEditUserMetadata(event, tabname, extraPage, cardName) {
+function extraNetworksEditUserMetadata(event, tabname, extraPage) {
     var id = tabname + '_' + extraPage + '_edit_user_metadata';
 
     var editor = extraPageUserMetadataEditors[id];
@@ -578,6 +580,7 @@ function extraNetworksEditUserMetadata(event, tabname, extraPage, cardName) {
         extraPageUserMetadataEditors[id] = editor;
     }
 
+    var cardName = event.target.parentElement.parentElement.getAttribute("data-name");
     editor.nameTextarea.value = cardName;
     updateInput(editor.nameTextarea);
 
diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 34c46ed40..afb95b516 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -243,14 +243,12 @@ class ExtraNetworksPage:
             btn_metadata = self.btn_metadata_tpl.format(
                 **{
                     "extra_networks_tabname": self.extra_networks_tabname,
-                    "name": html.escape(item["name"]),
                 }
             )
         btn_edit_item = self.btn_edit_item_tpl.format(
             **{
                 "tabname": tabname,
                 "extra_networks_tabname": self.extra_networks_tabname,
-                "name": html.escape(item["name"]),
             }
         )
 

From b5c33341a18f9dc3e20d06b56540af330fafa285 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Tue, 19 Mar 2024 19:06:56 -0600
Subject: [PATCH 2/2] Don't use quote_js on filename

---
 modules/ui_extra_networks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 741a4e143..6a206af07 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -239,7 +239,7 @@ class ExtraNetworksPage:
             )
             onclick = html.escape(onclick)
 
-        btn_copy_path = self.btn_copy_path_tpl.format(**{"filename": quote_js(item["filename"])})
+        btn_copy_path = self.btn_copy_path_tpl.format(**{"filename": item["filename"]})
         btn_metadata = ""
         metadata = item.get("metadata")
         if metadata: