From 3ae1803420aeb3c0ea2ef8c642bad4172484c084 Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jonathan@jooped.co.uk>
Date: Wed, 1 May 2019 09:40:48 +0100
Subject: [PATCH] Bug 1539507 - Fix targeting of button click when button
 element isn't clicked.

---
 src/js/confirm-page.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/js/confirm-page.js b/src/js/confirm-page.js
index fef08d4..9f6eb77 100644
--- a/src/js/confirm-page.js
+++ b/src/js/confirm-page.js
@@ -20,14 +20,21 @@ async function load() {
 
   document.getElementById("redirect-form").addEventListener("submit", (e) => {
     e.preventDefault();
-    const buttonTarget = e.explicitOriginalTarget;
-    switch (buttonTarget.id) {
-    case "confirm":
-      confirmSubmit(redirectUrl, cookieStoreId);
-      break;
+    let button = "confirm"; // Confirm is the form default.
+    let buttonTarget = e.explicitOriginalTarget;
+    if (buttonTarget.tagName !== "BUTTON") {
+      buttonTarget = buttonTarget.closest("button");
+    }
+    if (buttonTarget && buttonTarget.id) {
+      button = buttonTarget.id;
+    }
+    switch (button) {
     case "deny":
       denySubmit(redirectUrl);
       break;
+    case "confirm":
+      confirmSubmit(redirectUrl, cookieStoreId);
+      break;
     }
   });
 }