Issue 5587, 5748 - Use mobile options page on Firefox for Android

popup.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 104 matching lines @@
     "click", toggleEnabled, false
   );
   document.getElementById("clickhide").addEventListener(
     "click", activateClickHide, false
   );
   document.getElementById("clickhide-cancel").addEventListener(
     "click", cancelClickHide, false
   );
   document.getElementById("options").addEventListener("click", () =>
   {
-    ext.showOptions(window.close);
+    chrome.runtime.sendMessage({type: "app.open", what: "options"});

[Manish Jethani, 2017/10/04 20:21:47]

Since we no longer have require in the popup, we can't call showOptions
directly; instead we use the "app.open" message to the background page.

We'll also have to make corresponding changes in adblockplusui and update the
dependency here.

+    window.close();

[Sebastian Noack, 2017/10/04 21:38:49]

Did you test whether the message is still received by the background page, and
the options is opened reliably, both on Chrome and Firefox, if we close this
document as soon as the message is sent? If so, LGTM.

[Manish Jethani, 2017/10/04 22:03:51]

Yes, this works reliably.

   }, false);
 
   // Set up collapsing of menu items
   for (let collapser of document.getElementsByClassName("collapse"))
   {
     collapser.addEventListener("click", toggleCollapse, false);
     getPref(collapser.dataset.option, value =>
     {
       if (value)
       {
@@ skipping 38 matching lines @@
 
 function toggleCollapse(event)
 {
   let collapser = event.currentTarget;
   let collapsible = document.getElementById(collapser.dataset.collapsible);
   collapsible.classList.toggle("collapsed");
   togglePref(collapser.dataset.option);
 }
 
 document.addEventListener("DOMContentLoaded", onLoad, false);