Merge pull request #1686 from DeadlySurprise/fixCurrentContainerBtn

Fixes #1682 'open in current container button' not working

package.json

@@ -2,7 +2,7 @@
   "name": "testpilot-containers",
   "title": "Multi-Account Containers",
   "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/multi-account-containers/issues"

src/js/confirm-page.js

@@ -17,25 +17,14 @@ async function load() {
     const currentContainer = await browser.contextualIdentities.get(currentCookieStoreId);
     document.getElementById("current-container-name").textContent = currentContainer.name;
   }
-
-  document.getElementById("redirect-form").addEventListener("submit", (e) => {
+  document.getElementById("deny").addEventListener("click", (e) => {
     e.preventDefault();
-    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;
-    }
+    denySubmit(redirectUrl);
+  });
+
+  document.getElementById("confirm").addEventListener("click", (e) => {
+    e.preventDefault();
+    confirmSubmit(redirectUrl, cookieStoreId);
   });
 }
 

src/js/popup.js

@@ -611,7 +611,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
     });
 
     document.addEventListener("keydown", (e) => {
-      const selectables = [...document.querySelectorAll("[tabindex='0'], [tabindex='-1']")];
+      const selectables = [...document.querySelectorAll(".open-newtab[tabindex='0']")];
       const element = document.activeElement;
       const index = selectables.indexOf(element) || 0;
       function next() {
@@ -652,7 +652,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       default:
         if ((e.keyCode >= 49 && e.keyCode <= 57) &&
             Logic._currentPanel === "containersList") {
-          const element = selectables[e.keyCode - 48];
+          const element = selectables[e.keyCode - 49];
           if (element) {
             element.click();
           }

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Firefox Multi-Account Containers",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "incognito": "not_allowed",
   "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
   "icons": {