Issue 5977 - Set popup programmatically on Firefox

lib/options.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 112 matching lines @@
     }
   });
 };
 
 // We need to clear the popup URL on Firefox for Android in order for the
 // options page to open instead of the bubble. Unfortunately there's a bug[1]
 // which prevents us from doing that, so we must avoid setting the URL on
 // Firefox from the manifest at all, instead setting it here only for
 // non-mobile.
 // [1] - https://bugzilla.mozilla.org/show_bug.cgi?id=1414613
-if (info.application == "firefox")
-{
-  browser.browserAction.setPopup({popup: "popup.html"});
-}
-else if (info.platform == "gecko")
+if ("getBrowserInfo" in browser.runtime)
 {
   browser.runtime.getBrowserInfo().then(browserInfo =>
   {
     if (browserInfo.name != "Fennec")
       browser.browserAction.setPopup({popup: "popup.html"});
   });
+}
+else
+{
+  browser.browserAction.setPopup({popup: "popup.html"});
 }

[Wladimir Palant, 2017/11/06 15:04:31]

If we are choosing that approach, I wonder whether we should still have special
logic for Gecko. It could be:

  if (typeof browser.runtime.getBrowserInfo == "function")
    set popup conditionally, not for fennec
  else
    set popup unconditionally

[Manish Jethani, 2017/11/13 10:42:13]

I was hoping to restrict this to Gecko only to avoid any unintended side
effects, but I guess it's OK to make it generic. I've made the change and tested
it on Firefox (desktop and mobile) and Chrome now and it works OK.

Done.

 
 // On Firefox for Android, open the options page directly when the browser
 // action is clicked.
 browser.browserAction.onClicked.addListener(() =>
 {
   browser.tabs.query({active: true, lastFocusedWindow: true}, ([tab]) =>
   {
     let currentPage = new ext.Page(tab);
 
     showOptions(optionsPage =>
     {
       if (!/^https?:$/.test(currentPage.url.protocol))
         return;
 
       optionsPage.sendMessage({
         type: "app.respond",
         action: "showPageOptions",
         args: [
           {
             host: getDecodedHostname(currentPage.url).replace(/^www\./, ""),
             whitelisted: !!checkWhitelisted(currentPage)
           }
         ]
       });
     });
   });
 });