diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2023-01-21 06:48:38 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2023-01-21 06:58:57 +0000 |
| commit | 184e23eb89c198b42f351a4d5ff862ee64917619 (patch) | |
| tree | 9949eaedfc1a281ab8a2d39a7c7ec2290ca6c85e /javascript/extraNetworks.js | |
| parent | 6d805b669e86233432f56ee1892d062103abe501 (diff) | |
| download | stable-diffusion-webui-gfx803-184e23eb89c198b42f351a4d5ff862ee64917619.tar.gz stable-diffusion-webui-gfx803-184e23eb89c198b42f351a4d5ff862ee64917619.tar.bz2 stable-diffusion-webui-gfx803-184e23eb89c198b42f351a4d5ff862ee64917619.zip | |
relocate tool buttons next to generate button
prevent extra network tabs from putting images into wrong prompts
prevent settings leaking into prompt
Diffstat (limited to 'javascript/extraNetworks.js')
| -rw-r--r-- | javascript/extraNetworks.js | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index 71e522d1..5e0d9714 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -6,49 +6,42 @@ function setupExtraNetworksForTab(tabname){ gradioApp().querySelector('#'+tabname+'_extra_tabs > div').appendChild(gradioApp().getElementById(tabname+'_extra_close'))
}
-var activePromptTextarea = null;
-var activePositivePromptTextarea = null;
+var activePromptTextarea = {};
function setupExtraNetworks(){
setupExtraNetworksForTab('txt2img')
setupExtraNetworksForTab('img2img')
- function registerPrompt(id, isNegative){
+ function registerPrompt(tabname, id){
var textarea = gradioApp().querySelector("#" + id + " > label > textarea");
- if (activePromptTextarea == null){
- activePromptTextarea = textarea
- }
- if (activePositivePromptTextarea == null && ! isNegative){
- activePositivePromptTextarea = textarea
+ if (! activePromptTextarea[tabname]){
+ activePromptTextarea[tabname] = textarea
}
textarea.addEventListener("focus", function(){
- activePromptTextarea = textarea;
- if(! isNegative) activePositivePromptTextarea = textarea;
+ activePromptTextarea[tabname] = textarea;
});
}
- registerPrompt('txt2img_prompt')
- registerPrompt('txt2img_neg_prompt', true)
- registerPrompt('img2img_prompt')
- registerPrompt('img2img_neg_prompt', true)
+ registerPrompt('txt2img', 'txt2img_prompt')
+ registerPrompt('txt2img', 'txt2img_neg_prompt')
+ registerPrompt('img2img', 'img2img_prompt')
+ registerPrompt('img2img', 'img2img_neg_prompt')
}
onUiLoaded(setupExtraNetworks)
-function cardClicked(textToAdd, allowNegativePrompt){
- textarea = allowNegativePrompt ? activePromptTextarea : activePositivePromptTextarea
+function cardClicked(tabname, textToAdd, allowNegativePrompt){
+ var textarea = allowNegativePrompt ? activePromptTextarea[tabname] : gradioApp().querySelector("#" + tabname + "_prompt > label > textarea")
textarea.value = textarea.value + " " + textToAdd
updateInput(textarea)
-
- return false
}
function saveCardPreview(event, tabname, filename){
- textarea = gradioApp().querySelector("#" + tabname + '_preview_filename > label > textarea')
- button = gradioApp().getElementById(tabname + '_save_preview')
+ var textarea = gradioApp().querySelector("#" + tabname + '_preview_filename > label > textarea')
+ var button = gradioApp().getElementById(tabname + '_save_preview')
textarea.value = filename
updateInput(textarea)
|