| Index: messageResponder.js |
| =================================================================== |
| --- a/messageResponder.js |
| +++ b/messageResponder.js |
| @@ -34,16 +34,18 @@ |
| 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) |
| @@ -207,17 +209,17 @@ |
| { |
| 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); |
| }); |
| } |
| }); |
| @@ -347,17 +349,17 @@ |
| 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); |
| } |