Issue 5952 - Clicking Cancel in the issue reporter doesn't close the tab

issue-reporter.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 14 matching lines @@
 let pages = {
   typeSelectorPage: [initTypeSelector, leaveTypeSelector],
   commentPage: [initCommentPage, leaveCommentPage],
   sendPage: [initSendPage, leaveSendPage]
 };
 
 document.addEventListener("DOMContentLoaded", () =>
 {
   document.getElementById("cancel").addEventListener("click", () =>
   {
-    window.close();
+    closeMe();
   });
 
   document.getElementById("continue").addEventListener("click", () =>
   {
     if (!document.getElementById("continue").disabled)
       pages[getCurrentPage()][1]();
   });
 
   document.addEventListener("keydown", event =>
   {
@@ skipping 10 matching lines @@
     what: "doclink",
     link: "reporter_privacy"
   }).then(url =>
   {
     document.getElementById("privacyPolicy").href = url;
   });
 
   initDataCollector();
 });
 
+function closeMe()
+{
+  browser.runtime.sendMessage({
+    type: "app.get",
+    what: "senderId"
+  }).then(tabId => browser.tabs.remove(tabId));

[Thomas Greiner, 2017/11/02 12:39:51]

Wouldn't it make more sense to leave it up to the background page to close the
tab (e.g. "app.close") if we're already communicating with it anyway? That way
we wouldn't need to deal with implementation details in the UI.

[Wladimir Palant, 2017/11/02 13:16:51]

That's the approach I chose initially but so far we don't have any browser API
calls in messageResponder. It seems that leaving implementation details out of
messageResponder is intentional (makes testing easier).

[Thomas Greiner, 2017/11/02 14:13:02]

Not sure either whether this choice was made intentionally. Anyway, no
objections with this approach for now.

+}
+
 function getCurrentPage()
 {
   return document.querySelector(".page:not([hidden])").id;
 }
 
 function setCurrentPage(pageId)
 {
   if (!pages.hasOwnProperty(pageId))
     return;
 
@@ skipping 166 matching lines @@
       retrieveSubscriptions()
     ];
     return Promise.all(handlers);
   }).then(() =>
   {
     setCurrentPage("typeSelectorPage");
   }).catch(e =>
   {
     console.error(e);
     alert(e);
-    window.close();
+    closeMe();
   });
 }
 
 function initTypeSelector()
 {
   document.getElementById("typeFalsePositive").focus();
 
 
   for (let checkbox of document.querySelectorAll("input[name='type']"))
   {
@@ skipping 229 matching lines @@
       let progress = document.getElementById("sendingProgress");
       progress.max = event.total;
       progress.value = event.loaded;
     }
   });
   request.send(serializeReportData());
 }
 
 function leaveSendPage()
 {
-  window.close();
+  closeMe();
 }