Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions html/extra-networks-copy-path-button.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="copy-path-button card-button"
title="Copy path to clipboard"
onclick='extraNetworksCopyCardPath(event, {filename})'
data-clipboard-text={filename}>
onclick="extraNetworksCopyCardPath(event)"
data-clipboard-text="{filename}">
</div>
2 changes: 1 addition & 1 deletion html/extra-networks-edit-item-button.html
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion html/extra-networks-metadata-button.html
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 7 additions & 4 deletions javascript/extraNetworks.js
Original file line number Diff line number Diff line change
Expand Up @@ -605,16 +605,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);
Expand All @@ -628,7 +630,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];
Expand All @@ -640,6 +642,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);

Expand Down
4 changes: 1 addition & 3 deletions modules/ui_extra_networks.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,21 +239,19 @@ def create_item_html(
)
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:
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"]),
}
)

Expand Down