diff options
| author | unknown <mcgpapu@gmail.com> | 2023-01-30 11:12:31 +0000 |
|---|---|---|
| committer | unknown <mcgpapu@gmail.com> | 2023-01-30 11:12:31 +0000 |
| commit | 21766a0898fd9cc344c5d100396280fa8b0c4e74 (patch) | |
| tree | 2a365bb6bc60c9916004e67c04f3816880366edf /javascript/extraNetworks.js | |
| parent | e79b7db4b47a33889551b9266ee3277879d4f560 (diff) | |
| parent | aa4688eb8345de583070ca9ddb4c6f585f06762b (diff) | |
| download | stable-diffusion-webui-gfx803-21766a0898fd9cc344c5d100396280fa8b0c4e74.tar.gz stable-diffusion-webui-gfx803-21766a0898fd9cc344c5d100396280fa8b0c4e74.tar.bz2 stable-diffusion-webui-gfx803-21766a0898fd9cc344c5d100396280fa8b0c4e74.zip | |
Merge branch 'master' of github.com:AUTOMATIC1111/stable-diffusion-webui into gamepad
Diffstat (limited to 'javascript/extraNetworks.js')
| -rw-r--r-- | javascript/extraNetworks.js | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index c5a9adb3..17bf2000 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -16,7 +16,7 @@ function setupExtraNetworksForTab(tabname){ searchTerm = search.value.toLowerCase()
gradioApp().querySelectorAll('#'+tabname+'_extra_tabs div.card').forEach(function(elem){
- text = elem.querySelector('.name').textContent.toLowerCase()
+ text = elem.querySelector('.name').textContent.toLowerCase() + " " + elem.querySelector('.search_term').textContent.toLowerCase()
elem.style.display = text.indexOf(searchTerm) == -1 ? "none" : ""
})
});
@@ -48,10 +48,39 @@ function setupExtraNetworks(){ onUiLoaded(setupExtraNetworks)
+var re_extranet = /<([^:]+:[^:]+):[\d\.]+>/;
+var re_extranet_g = /\s+<([^:]+:[^:]+):[\d\.]+>/g;
+
+function tryToRemoveExtraNetworkFromPrompt(textarea, text){
+ var m = text.match(re_extranet)
+ if(! m) return false
+
+ var partToSearch = m[1]
+ var replaced = false
+ var newTextareaText = textarea.value.replaceAll(re_extranet_g, function(found, index){
+ m = found.match(re_extranet);
+ if(m[1] == partToSearch){
+ replaced = true;
+ return ""
+ }
+ return found;
+ })
+
+ if(replaced){
+ textarea.value = newTextareaText
+ return true;
+ }
+
+ return false
+}
+
function cardClicked(tabname, textToAdd, allowNegativePrompt){
var textarea = allowNegativePrompt ? activePromptTextarea[tabname] : gradioApp().querySelector("#" + tabname + "_prompt > label > textarea")
- textarea.value = textarea.value + " " + textToAdd
+ if(! tryToRemoveExtraNetworkFromPrompt(textarea, textToAdd)){
+ textarea.value = textarea.value + " " + textToAdd
+ }
+
updateInput(textarea)
}
@@ -67,3 +96,12 @@ function saveCardPreview(event, tabname, filename){ event.stopPropagation()
event.preventDefault()
}
+
+function extraNetworksSearchButton(tabs_id, event){
+ searchTextarea = gradioApp().querySelector("#" + tabs_id + ' > div > textarea')
+ button = event.target
+ text = button.classList.contains("search-all") ? "" : button.textContent.trim()
+
+ searchTextarea.value = text
+ updateInput(searchTextarea)
+}
\ No newline at end of file |