From 1ec769f1ae56101c080187dbc7333e06beb2f323 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 11 Dec 2023 14:02:19 +1000
Subject: [PATCH] Fix some issues with toggle mask shortcut

- We were registered another event handler for each card, which was a
resource leak, and would lead to the shortcut failing on every second card
due to the even number of toggles.
- We were allowing toggleMasks() to run even when the button wasn't visible
(e.g., when showing the question side of a card)
---
 ts/image-occlusion/review.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ts/image-occlusion/review.ts b/ts/image-occlusion/review.ts
index e60387236..b0d1ceeaf 100644
--- a/ts/image-occlusion/review.ts
+++ b/ts/image-occlusion/review.ts
@@ -111,6 +111,8 @@ function calculateContainerSize(
     return { width: img.naturalWidth * ratio, height: img.naturalHeight * ratio };
 }
 
+let oneTimeSetupDone = false;
+
 function setupImageOcclusionInner(setupOptions?: SetupImageOcclusionOptions): void {
     const canvas = document.querySelector(
         "#image-occlusion-canvas",
@@ -146,6 +148,16 @@ function setupImageOcclusionInner(setupOptions?: SetupImageOcclusionOptions): vo
     canvas.width = size.width;
     canvas.height = size.height;
 
+    if (!oneTimeSetupDone) {
+        window.addEventListener("keydown", (event) => {
+            const button = document.getElementById("toggle");
+            if (button && button.style.display !== "none" && event.key === "M") {
+                toggleMasks();
+            }
+        });
+        oneTimeSetupDone = true;
+    }
+
     // setup button for toggle image occlusion
     const button = document.getElementById("toggle");
     if (button) {
@@ -154,12 +166,6 @@ function setupImageOcclusionInner(setupOptions?: SetupImageOcclusionOptions): vo
         } else {
             button.style.display = "none";
         }
-
-        window.addEventListener("keydown", (event) => {
-            if (event.key === "M") {
-                toggleMasks();
-            }
-        });
     }
 
     drawShapes(canvas, setupOptions?.onWillDrawShapes, setupOptions?.onDidDrawShapes);