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

popup.js

Index: popup.js
===================================================================
--- a/popup.js
+++ b/popup.js
@@ -19,16 +19,17 @@
 
 const {require} = ext.backgroundPage.getWindow();
 
 const {Filter} = require("filterClasses");
 const {FilterStorage} = require("filterStorage");
 const {Prefs} = require("prefs");
 const {checkWhitelisted} = require("whitelisting");
 const {getDecodedHostname} = require("url");
+const {showOptions} = require("options");
 
 let page = null;
 
 function onLoad()
 {
   ext.pages.query({active: true, lastFocusedWindow: true}, pages =>
   {
     page = pages[0];
@@ -72,17 +73,17 @@
   document.getElementById("clickhide").addEventListener(
     "click", activateClickHide, false
   );
   document.getElementById("clickhide-cancel").addEventListener(
     "click", cancelClickHide, false
   );
   document.getElementById("options").addEventListener("click", () =>
   {
-    ext.showOptions();
+    showOptions();

[Manish Jethani, 2017/09/26 20:37:19]

I realize I need to rebase this one on next too.

   }, false);
 
   // Set up collapsing of menu items
   for (let collapser of document.getElementsByClassName("collapse"))
   {
     collapser.addEventListener("click", toggleCollapse, false);
     if (!Prefs[collapser.dataset.option])
     {