| Index: messageResponder.js |
| =================================================================== |
| --- a/messageResponder.js |
| +++ b/messageResponder.js |
| @@ -16,41 +16,42 @@ |
| */ |
| /* globals require */ |
| "use strict"; |
| (function(global) |
| { |
| - const {port} = require("messaging"); |
| - const {Prefs} = require("prefs"); |
| - const {Utils} = require("utils"); |
| - const {FilterStorage} = require("filterStorage"); |
| - const {FilterNotifier} = require("filterNotifier"); |
| - const {defaultMatcher} = require("matcher"); |
| - const {Notification: NotificationStorage} = require("notification"); |
| + const {port} = require("../lib/messaging"); |
| + const {Prefs} = require("../lib/prefs"); |
| + const {Utils} = require("../lib/utils"); |
| + const {FilterStorage} = require("../adblockpluscore/lib/filterStorage"); |
| + const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier"); |
| + const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| + const {Notification: |
| + NotificationStorage} = require("../adblockpluscore/lib/notification"); |
| const {getActiveNotification, shouldDisplay, |
| - notificationClicked} = require("notificationHelper"); |
| - const {HitLogger} = require("hitLogger"); |
| + notificationClicked} = require("../lib/notificationHelper"); |
| + const {HitLogger} = require("../lib/hitLogger"); |
| const { |
| Filter, ActiveFilter, BlockingFilter, RegExpFilter |
| - } = require("filterClasses"); |
| - const {Synchronizer} = require("synchronizer"); |
| + } = require("../adblockpluscore/lib/filterClasses"); |
| + const {Synchronizer} = require("../adblockpluscore/lib/synchronizer"); |
| const info = require("info"); |
| const { |
| Subscription, |
| DownloadableSubscription, |
| SpecialSubscription, |
| RegularSubscription |
| - } = require("subscriptionClasses"); |
| + } = require("../adblockpluscore/lib/subscriptionClasses"); |
| - const {showOptions} = require("options"); |
| + const {showOptions} = require("../lib/options"); |
| port.on("types.get", (message, sender) => |
| { |
| const filterTypes = Array.from(require("requestBlocker").filterTypes); |
| filterTypes.push(...filterTypes.splice(filterTypes.indexOf("OTHER"), 1)); |
| return filterTypes; |
| }); |