Unverified Commit 20f378a3 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #1405 from tsngo/return-key-prompt-submit

ALT + return will submit prompt when it's in focus
parents 89f0acc6 d1db3300
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -186,10 +186,12 @@ onUiUpdate(function(){
	if (!txt2img_textarea) {
		txt2img_textarea = gradioApp().querySelector("#txt2img_prompt > label > textarea");
		txt2img_textarea?.addEventListener("input", () => update_token_counter("txt2img_token_button"));
        txt2img_textarea?.addEventListener("keyup", (event) => submit_prompt(event, "txt2img_generate"));
	}
	if (!img2img_textarea) {
		img2img_textarea = gradioApp().querySelector("#img2img_prompt > label > textarea");
		img2img_textarea?.addEventListener("input", () => update_token_counter("img2img_token_button"));
        txt2img_textarea?.addEventListener("keyup", (event) => submit_prompt(event, "img2img_generate"));
	}
})

@@ -197,6 +199,14 @@ 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 update_token_counter(button_id) {
	if (token_timeout)
		clearTimeout(token_timeout);
+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ def create_toprow(is_img2img):
        with gr.Column(scale=1):
            with gr.Row():
                interrupt = gr.Button('Interrupt', elem_id=f"{id_part}_interrupt")
                submit = gr.Button('Generate', elem_id="generate", variant='primary')
                submit = gr.Button('Generate', elem_id=f"{id_part}_generate", variant='primary')

                interrupt.click(
                    fn=lambda: shared.state.interrupt(),
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
    text-align: right;
}

#generate{
#txt2img_generate, #img2img_generate {
    min-height: 4.5em;
}