token counters now update when roll artist and style buttons are pressed https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/1194#issuecomment-1261203893

2 files changed, 27 insertions, 7 deletions

diff --git a/javascript/ui.js b/javascript/ui.js
index bfe02410..88fd45ae 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -199,12 +199,21 @@ let txt2img_textarea, img2img_textarea = undefined;
 let wait_time = 800
 let token_timeout;
 
-function submit_prompt(event, generate_button_id) {
-    if (event.altKey && event.keyCode === 13) {
-        event.preventDefault();
-        gradioApp().getElementById(generate_button_id).click();
-        return;
-    }
+function roll_artist_txt2img(prompt_text) {
+	update_token_counter("txt2img_token_button")
+	return prompt_text;
+}
+function roll_artist_img2img(prompt_text) {
+	update_token_counter("img2img_token_button")
+	return prompt_text;
+}
+function update_style_txt2img(prompt_text, negative_prompt, style1, style2) {
+	update_token_counter("txt2img_token_button")
+	return [prompt_text, negative_prompt, style1, style2]
+}
+function update_style_img2img(prompt_text, negative_prompt, style1, style2) {
+	update_token_counter("img2img_token_button")
+	return [prompt_text, negative_prompt, style1, style2]
 }
 
 function update_token_counter(button_id) {
@@ -212,3 +221,10 @@ function update_token_counter(button_id) {
 		clearTimeout(token_timeout);
 	token_timeout = setTimeout(() => gradioApp().getElementById(button_id)?.click(), wait_time);
 }
+function submit_prompt(event, generate_button_id) {
+    if (event.altKey && event.keyCode === 13) {
+        event.preventDefault();
+        gradioApp().getElementById(generate_button_id).click();
+        return;
+    }
+}
\ No newline at end of file
diff --git a/modules/ui.py b/modules/ui.py
index 15572bb0..5eea1860 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -539,6 +539,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

             roll.click(

                 fn=roll_artist,

+                _js="roll_artist_txt2img",

                 inputs=[

                     txt2img_prompt,

                 ],

@@ -743,6 +744,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

             roll.click(

                 fn=roll_artist,

+                _js="roll_artist_img2img",

                 inputs=[

                     img2img_prompt,

                 ],

@@ -753,6 +755,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

             prompts = [(txt2img_prompt, txt2img_negative_prompt), (img2img_prompt, img2img_negative_prompt)]

             style_dropdowns = [(txt2img_prompt_style, txt2img_prompt_style2), (img2img_prompt_style, img2img_prompt_style2)]

+            style_js_funcs = ["update_style_txt2img", "update_style_img2img"]

 

             for button, (prompt, negative_prompt) in zip([txt2img_save_style, img2img_save_style], prompts):

                 button.click(

@@ -764,9 +767,10 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                     outputs=[txt2img_prompt_style, img2img_prompt_style, txt2img_prompt_style2, img2img_prompt_style2],

                 )

 

-            for button, (prompt, negative_prompt), (style1, style2) in zip([txt2img_prompt_style_apply, img2img_prompt_style_apply], prompts, style_dropdowns):

+            for button, (prompt, negative_prompt), (style1, style2), js_func in zip([txt2img_prompt_style_apply, img2img_prompt_style_apply], prompts, style_dropdowns, style_js_funcs):

                 button.click(

                     fn=apply_styles,

+                    _js=js_func,

                     inputs=[prompt, negative_prompt, style1, style2],

                     outputs=[prompt, negative_prompt, style1, style2],

                 )