From 184e23eb89c198b42f351a4d5ff862ee64917619 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 21 Jan 2023 09:48:38 +0300
Subject: relocate tool buttons next to generate button prevent extra network
 tabs from putting images into wrong prompts prevent settings leaking into
 prompt

---
 javascript/extraNetworks.js | 33 +++++++++++++--------------------
 javascript/ui.js            |  4 ++--
 2 files changed, 15 insertions(+), 22 deletions(-)

(limited to 'javascript')

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)
diff --git a/javascript/ui.js b/javascript/ui.js
index a7e75439..77256e15 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -203,8 +203,8 @@ onUiUpdate(function(){
 	json_elem = gradioApp().getElementById('settings_json')
 	if(json_elem == null) return;
 
-    textarea = json_elem.querySelector('textarea')
-    jsdata = textarea.value
+    var textarea = json_elem.querySelector('textarea')
+    var jsdata = textarea.value
     opts = JSON.parse(jsdata)
     executeCallbacks(optionsChangedCallbacks);
 
-- 
cgit v1.2.1