diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-15 21:56:53 +0000 |
---|---|---|
committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-15 21:57:45 +0000 |
commit | 11f339733de860b0b51adebe15dc945df7189edf (patch) | |
tree | 02d7036c9488c802ddbdaf6819e6006654ca208f /javascript | |
parent | 5decbf184b185026d5da9e2c7be02d06fd640f12 (diff) | |
download | stable-diffusion-webui-gfx803-11f339733de860b0b51adebe15dc945df7189edf.tar.gz stable-diffusion-webui-gfx803-11f339733de860b0b51adebe15dc945df7189edf.tar.bz2 stable-diffusion-webui-gfx803-11f339733de860b0b51adebe15dc945df7189edf.zip |
add lora user metadata editor dialog inspired by MrKuenning's mockup from #7458
Diffstat (limited to 'javascript')
-rw-r--r-- | javascript/extraNetworks.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index 7007b353..8b67bf2b 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -113,7 +113,7 @@ function setupExtraNetworks() { onUiLoaded(setupExtraNetworks); -var re_extranet = /<([^:]+:[^:]+):[\d.]+>/; +var re_extranet = /<([^:]+:[^:]+):[\d.]+>(.*)/; var re_extranet_g = /\s+<([^:]+:[^:]+):[\d.]+>/g; function tryToRemoveExtraNetworkFromPrompt(textarea, text) { @@ -121,15 +121,22 @@ function tryToRemoveExtraNetworkFromPrompt(textarea, text) { var replaced = false; var newTextareaText; if (m) { + var extraTextAfterNet = m[2]; var partToSearch = m[1]; - newTextareaText = textarea.value.replaceAll(re_extranet_g, function(found) { + var foundAtPosition = -1; + newTextareaText = textarea.value.replaceAll(re_extranet_g, function(found, net, pos) { m = found.match(re_extranet); if (m[1] == partToSearch) { replaced = true; + foundAtPosition = pos; return ""; } return found; }); + + if (foundAtPosition >= 0 && newTextareaText.substr(foundAtPosition, extraTextAfterNet.length) == extraTextAfterNet) { + newTextareaText = newTextareaText.substr(0, foundAtPosition) + newTextareaText.substr(foundAtPosition + extraTextAfterNet.length); + } } else { newTextareaText = textarea.value.replaceAll(new RegExp(text, "g"), function(found) { if (found == text) { @@ -288,3 +295,10 @@ function extraNetworksEditUserMetadata(event, tabname, extraPage, cardName) { event.stopPropagation(); } + +function extraNetworksReloadAll() { + closePopup(); + + gradioApp().getElementById('txt2img_extra_refresh').click(); + gradioApp().getElementById('img2img_extra_refresh').click(); +} |