Unverified Commit 861cbd56 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #13644 from XpucT/dev

Start / Restart generation by Ctrl (Alt) + Enter
parents 2f6ea8b1 d33cb2b8
Loading
Loading
Loading
Loading
+14 −10
Original line number Diff line number Diff line
@@ -124,16 +124,20 @@ document.addEventListener("DOMContentLoaded", function() {
 * Add a ctrl+enter as a shortcut to start a generation
 */
document.addEventListener('keydown', function(e) {
    var handled = false;
    if (e.key !== undefined) {
        if ((e.key == "Enter" && (e.metaKey || e.ctrlKey || e.altKey))) handled = true;
    } else if (e.keyCode !== undefined) {
        if ((e.keyCode == 13 && (e.metaKey || e.ctrlKey || e.altKey))) handled = true;
    }
    if (handled) {
        var button = get_uiCurrentTabContent().querySelector('button[id$=_generate]');
        if (button) {
            button.click();
    const isEnter = e.key === 'Enter' || e.keyCode === 13;
    const isModifierKey = e.metaKey || e.ctrlKey || e.altKey;

    const interruptButton = get_uiCurrentTabContent().querySelector('button[id$=_interrupt]');
    const generateButton = get_uiCurrentTabContent().querySelector('button[id$=_generate]');

    if (isEnter && isModifierKey) {
        if (interruptButton.style.display === 'block') {
            interruptButton.click();
            setTimeout(function() {
                generateButton.click();
            }, 500);
        } else {
            generateButton.click();
        }
        e.preventDefault();
    }