Noissue - Don't hard-code options and popup URL

lib/options.js

Index: lib/options.js
===================================================================
--- a/lib/options.js
+++ b/lib/options.js
@@ -22,7 +22,9 @@
 const {checkWhitelisted} = require("./whitelisting");
 const info = require("../buildtools/info");
 
-const optionsUrl = "options.html";
+const manifest = browser.runtime.getManifest();
+const optionsUrl = manifest.options_page || manifest.options_ui.page;

[kzar, 2018/05/15 13:32:31]

I trust you got it right, but i wonder where manifest.options_page comes from. I
just checked and I see it as manifest.options_ui.page for both gecko and chrome.

[Sebastian Noack, 2018/05/15 14:17:15]

That is correct, but there is also Microsoft Edge where it is options_page.

+const popupUrl = manifest.browser_action.default_popup;

[kzar, 2018/05/15 13:32:31]

I don't see this one for gecko.

[Sebastian Noack, 2018/05/15 14:17:15]

Argh, right. We removed the popup URL from the manifest in the Firefox build.
I'm doing it the other way around now.

 
 function findOptionsTab(callback)
 {
@@ -187,12 +189,12 @@
   browser.runtime.getBrowserInfo().then(browserInfo =>
   {
     if (browserInfo.name != "Fennec")
-      browser.browserAction.setPopup({popup: "popup.html"});
+      browser.browserAction.setPopup({popup: popupUrl});
   });
 }
 else
 {
-  browser.browserAction.setPopup({popup: "popup.html"});
+  browser.browserAction.setPopup({popup: popupUrl});
 }
 
 // On Firefox for Android, open the options page directly when the browser