Issue 5587 - Use options module

messageResponder.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 21 matching lines @@
   const {Filter, BlockingFilter, RegExpFilter} = require("filterClasses");
   const {Synchronizer} = require("synchronizer");
 
   const info = require("info");
   const {
     Subscription,
     DownloadableSubscription,
     SpecialSubscription
   } = require("subscriptionClasses");
 
+  const {showOptions} = require("options");
+
   port.on("types.get", (message, sender) =>
   {
     let filterTypes = Array.from(require("requestBlocker").filterTypes);
     filterTypes.push(...filterTypes.splice(filterTypes.indexOf("OTHER"), 1));
     return filterTypes;
   });
 
   function convertObject(keys, obj)
   {
     let result = {};
@@ skipping 153 matching lines @@
 
   port.on("app.listen", (message, sender) =>
   {
     getListenerFilters(sender.page).app = message.filter;
   });
 
   port.on("app.open", (message, sender) =>
   {
     if (message.what == "options")
     {
-      ext.showOptions(() =>
+      showOptions(() =>
       {
         if (!message.action)
           return;
 
         sendMessage("app", message.action, ...message.args);
       });
     }
   });
 
   port.on("filters.add", (message, sender) =>
@@ skipping 119 matching lines @@
   port.on("subscriptions.add", (message, sender) =>
   {
     let subscription = Subscription.fromURL(message.url);
     if (message.confirm)
     {
       if ("title" in message)
         subscription.title = message.title;
       if ("homepage" in message)
         subscription.homepage = message.homepage;
 
-      ext.showOptions(() =>
+      showOptions(() =>
       {
         sendMessage("app", "addSubscription", subscription);
       });
     }
     else
     {
       addSubscription(subscription, message);
     }
   });
 
@@ skipping 48 matching lines @@
     if (message.url)
       subscriptions = [Subscription.fromURL(message.url)];
 
     for (let subscription of subscriptions)
     {
       if (subscription instanceof DownloadableSubscription)
         Synchronizer.execute(subscription, true);
     }
   });
 })(this);