From 5dd3f46cee7b391b0b428fbb0bf694dfecb5333c Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Fri, 31 Mar 2023 00:02:44 -0700
Subject: [PATCH 1/3] Fix key presses in the image editor

https://discord.com/channels/1014774730907209781/1021695193499582494/1090733238034645082
---
 ui/media/js/image-editor.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/media/js/image-editor.js b/ui/media/js/image-editor.js
index 8c246eab..68ca969a 100644
--- a/ui/media/js/image-editor.js
+++ b/ui/media/js/image-editor.js
@@ -672,12 +672,18 @@ class ImageEditor {
 				else {
 					this.history.redo()
 				}
+			        event.stopPropagation();
+				event.preventDefault();
 			}
 			if (event.key == "y" && event.ctrlKey) {
 				this.history.redo()
+			        event.stopPropagation();
+				event.preventDefault();
 			}
 			if (event.key === "Escape") {
 				this.hide()
+			        event.stopPropagation();
+				event.preventDefault();
 			}
 		}
 		

From 0b5c5b646f43e88b25140c10738b2f1ec7bf36ed Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Fri, 31 Mar 2023 22:50:36 -0700
Subject: [PATCH 2/3] Correct fix for Ctrl+Z shortcut in image editor

---
 ui/media/js/image-editor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/media/js/image-editor.js b/ui/media/js/image-editor.js
index 68ca969a..c8e82b40 100644
--- a/ui/media/js/image-editor.js
+++ b/ui/media/js/image-editor.js
@@ -512,13 +512,13 @@ class ImageEditor {
 	}
 	show() {
 		this.popup.classList.add("active")
-		document.addEventListener("keydown", this.keyHandlerBound)
-		document.addEventListener("keyup", this.keyHandlerBound)
+		document.addEventListener("keydown", this.keyHandlerBound, true)
+		document.addEventListener("keyup", this.keyHandlerBound, true)
 	}
 	hide() {
 		this.popup.classList.remove("active")
-		document.removeEventListener("keydown", this.keyHandlerBound)
-		document.removeEventListener("keyup", this.keyHandlerBound)
+		document.removeEventListener("keydown", this.keyHandlerBound, true)
+		document.removeEventListener("keyup", this.keyHandlerBound, true)
 	}
 	setSize(width, height) {
 		if (width == this.width && height == this.height) {

From 1429a44f0e5790aecc38b1f5dfecec693367ebcf Mon Sep 17 00:00:00 2001
From: patriceac <48073125+patriceac@users.noreply.github.com>
Date: Sat, 1 Apr 2023 00:00:19 -0700
Subject: [PATCH 3/3] Align source code formatting

---
 ui/media/js/image-editor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/media/js/image-editor.js b/ui/media/js/image-editor.js
index c8e82b40..b095d54d 100644
--- a/ui/media/js/image-editor.js
+++ b/ui/media/js/image-editor.js
@@ -672,17 +672,17 @@ class ImageEditor {
 				else {
 					this.history.redo()
 				}
-			        event.stopPropagation();
+				event.stopPropagation();
 				event.preventDefault();
 			}
 			if (event.key == "y" && event.ctrlKey) {
 				this.history.redo()
-			        event.stopPropagation();
+				event.stopPropagation();
 				event.preventDefault();
 			}
 			if (event.key === "Escape") {
 				this.hide()
-			        event.stopPropagation();
+				event.stopPropagation();
 				event.preventDefault();
 			}
 		}