From 9c201550ddae0b33367adfb99bcbb57ba9b207a9 Mon Sep 17 00:00:00 2001
From: kaalibro <konstantin.adamovich@gmail.com>
Date: Sat, 9 Dec 2023 21:04:45 +0600
Subject: Add keyboard shortcuts for generation

(Removed Alt+Enter) Ctrl+Enter to start/restart generation
(New) Alt/Option+Enter to skip generation
(New) Ctrl+Alt/Option+Enter to interrupt generation
---
 script.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'script.js')

diff --git a/script.js b/script.js
index c0e678ea..69598f45 100644
--- a/script.js
+++ b/script.js
@@ -121,16 +121,21 @@ document.addEventListener("DOMContentLoaded", function() {
 });
 
 /**
- * Add a ctrl+enter as a shortcut to start a generation
+ * Add keyboard shortcuts:
+ * Ctrl+Enter to start/restart a generation
+ * Alt/Option+Enter to skip a generation
+ * Alt/Option+Ctrl+Enter to interrupt a generation
  */
 document.addEventListener('keydown', function(e) {
     const isEnter = e.key === 'Enter' || e.keyCode === 13;
-    const isModifierKey = e.metaKey || e.ctrlKey || e.altKey;
+    const isCtrlKey = e.metaKey || e.ctrlKey;
+    const isAltKey = e.altKey;
 
-    const interruptButton = get_uiCurrentTabContent().querySelector('button[id$=_interrupt]');
     const generateButton = get_uiCurrentTabContent().querySelector('button[id$=_generate]');
+    const interruptButton = get_uiCurrentTabContent().querySelector('button[id$=_interrupt]');
+    const skipButton = get_uiCurrentTabContent().querySelector('button[id$=_skip]');
 
-    if (isEnter && isModifierKey) {
+    if (isCtrlKey && isEnter && !isAltKey) {
         if (interruptButton.style.display === 'block') {
             interruptButton.click();
             const callback = (mutationList) => {
@@ -150,6 +155,16 @@ document.addEventListener('keydown', function(e) {
         }
         e.preventDefault();
     }
+
+    if (isAltKey && isEnter && !isCtrlKey) {
+        skipButton.click();
+        e.preventDefault();
+    }
+
+    if (isAltKey && isCtrlKey && isEnter) {
+        interruptButton.click();
+        e.preventDefault();
+    }
 });
 
 /**
-- 
cgit v1.2.3


From 1d42babd324b933bae317cb427fe0513138954f4 Mon Sep 17 00:00:00 2001
From: kaalibro <konstantin.adamovich@gmail.com>
Date: Sun, 10 Dec 2023 16:28:56 +0600
Subject: Replace Ctrl+Alt+Enter with Esc

---
 script.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'script.js')

diff --git a/script.js b/script.js
index 69598f45..44950090 100644
--- a/script.js
+++ b/script.js
@@ -124,18 +124,19 @@ document.addEventListener("DOMContentLoaded", function() {
  * Add keyboard shortcuts:
  * Ctrl+Enter to start/restart a generation
  * Alt/Option+Enter to skip a generation
- * Alt/Option+Ctrl+Enter to interrupt a generation
+ * Esc to interrupt a generation
  */
 document.addEventListener('keydown', function(e) {
     const isEnter = e.key === 'Enter' || e.keyCode === 13;
     const isCtrlKey = e.metaKey || e.ctrlKey;
     const isAltKey = e.altKey;
+    const isEsc = e.key === 'Escape';
 
     const generateButton = get_uiCurrentTabContent().querySelector('button[id$=_generate]');
     const interruptButton = get_uiCurrentTabContent().querySelector('button[id$=_interrupt]');
     const skipButton = get_uiCurrentTabContent().querySelector('button[id$=_skip]');
 
-    if (isCtrlKey && isEnter && !isAltKey) {
+    if (isCtrlKey && isEnter) {
         if (interruptButton.style.display === 'block') {
             interruptButton.click();
             const callback = (mutationList) => {
@@ -156,14 +157,18 @@ document.addEventListener('keydown', function(e) {
         e.preventDefault();
     }
 
-    if (isAltKey && isEnter && !isCtrlKey) {
+    if (isAltKey && isEnter) {
         skipButton.click();
         e.preventDefault();
     }
 
-    if (isAltKey && isCtrlKey && isEnter) {
-        interruptButton.click();
-        e.preventDefault();
+    if (isEsc) {
+        if (!globalPopup || globalPopup.style.display === "none") {
+            interruptButton.click();
+            e.preventDefault();
+        } else {
+            closePopup();
+        }
     }
 });
 
-- 
cgit v1.2.3


From cee1a4065162982e18f32761259d9107538c2d93 Mon Sep 17 00:00:00 2001
From: kaalibro <konstantin.adamovich@gmail.com>
Date: Sun, 10 Dec 2023 17:06:12 +0600
Subject: Fix linter issues

---
 script.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'script.js')

diff --git a/script.js b/script.js
index 44950090..354154b0 100644
--- a/script.js
+++ b/script.js
@@ -163,11 +163,13 @@ document.addEventListener('keydown', function(e) {
     }
 
     if (isEsc) {
+        const globalPopup = document.querySelector('.global-popup');
         if (!globalPopup || globalPopup.style.display === "none") {
             interruptButton.click();
             e.preventDefault();
         } else {
-            closePopup();
+            if (!globalPopup) return;
+            globalPopup.style.display = "none";
         }
     }
 });
-- 
cgit v1.2.3


From 6513470f0db1aed1b0a5200634e8e02f7c05e932 Mon Sep 17 00:00:00 2001
From: kaalibro <konstantin.adamovich@gmail.com>
Date: Mon, 11 Dec 2023 18:06:08 +0600
Subject: Remove unnecessary 'else', add 'lightboxModal' check

---
 script.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'script.js')

diff --git a/script.js b/script.js
index 354154b0..be1bc317 100644
--- a/script.js
+++ b/script.js
@@ -164,12 +164,11 @@ document.addEventListener('keydown', function(e) {
 
     if (isEsc) {
         const globalPopup = document.querySelector('.global-popup');
-        if (!globalPopup || globalPopup.style.display === "none") {
+        const lightboxModal = document.querySelector('#lightboxModal');
+        if (!globalPopup || globalPopup.style.display === 'none') {
+            if (document.activeElement === lightboxModal) return;
             interruptButton.click();
             e.preventDefault();
-        } else {
-            if (!globalPopup) return;
-            globalPopup.style.display = "none";
         }
     }
 });
-- 
cgit v1.2.3