| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 /* globals require */ | 18 /* globals require */ |
| 19 | 19 |
| 20 "use strict"; | 20 "use strict"; |
| 21 | 21 |
| 22 (function(global) | 22 (function(global) |
| 23 { | 23 { |
| 24 const {port} = require("messaging"); | 24 const {port} = require("../lib/messaging"); |
| 25 const {Prefs} = require("prefs"); | 25 const {Prefs} = require("../lib/prefs"); |
| 26 const {Utils} = require("utils"); | 26 const {Utils} = require("../lib/utils"); |
| 27 const {FilterStorage} = require("filterStorage"); | 27 const {FilterStorage} = require("../adblockpluscore/lib/filterStorage"); |
| 28 const {FilterNotifier} = require("filterNotifier"); | 28 const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier"); |
| 29 const {defaultMatcher} = require("matcher"); | 29 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| 30 const {Notification: NotificationStorage} = require("notification"); | 30 const {Notification: |
| 31 NotificationStorage} = require("../adblockpluscore/lib/notification"); |
| 31 const {getActiveNotification, shouldDisplay, | 32 const {getActiveNotification, shouldDisplay, |
| 32 notificationClicked} = require("notificationHelper"); | 33 notificationClicked} = require("../lib/notificationHelper"); |
| 33 const {HitLogger} = require("hitLogger"); | 34 const {HitLogger} = require("../lib/hitLogger"); |
| 34 | 35 |
| 35 const { | 36 const { |
| 36 Filter, ActiveFilter, BlockingFilter, RegExpFilter | 37 Filter, ActiveFilter, BlockingFilter, RegExpFilter |
| 37 } = require("filterClasses"); | 38 } = require("../adblockpluscore/lib/filterClasses"); |
| 38 const {Synchronizer} = require("synchronizer"); | 39 const {Synchronizer} = require("../adblockpluscore/lib/synchronizer"); |
| 39 | 40 |
| 40 const info = require("info"); | 41 const info = require("info"); |
| 41 const { | 42 const { |
| 42 Subscription, | 43 Subscription, |
| 43 DownloadableSubscription, | 44 DownloadableSubscription, |
| 44 SpecialSubscription, | 45 SpecialSubscription, |
| 45 RegularSubscription | 46 RegularSubscription |
| 46 } = require("subscriptionClasses"); | 47 } = require("../adblockpluscore/lib/subscriptionClasses"); |
| 47 | 48 |
| 48 const {showOptions} = require("options"); | 49 const {showOptions} = require("../lib/options"); |
| 49 | 50 |
| 50 port.on("types.get", (message, sender) => | 51 port.on("types.get", (message, sender) => |
| 51 { | 52 { |
| 52 const filterTypes = Array.from(require("requestBlocker").filterTypes); | 53 const filterTypes = Array.from(require("requestBlocker").filterTypes); |
| 53 filterTypes.push(...filterTypes.splice(filterTypes.indexOf("OTHER"), 1)); | 54 filterTypes.push(...filterTypes.splice(filterTypes.indexOf("OTHER"), 1)); |
| 54 return filterTypes; | 55 return filterTypes; |
| 55 }); | 56 }); |
| 56 | 57 |
| 57 function convertObject(keys, obj) | 58 function convertObject(keys, obj) |
| 58 { | 59 { |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 // "*.listen" messages to tackle #6440 | 524 // "*.listen" messages to tackle #6440 |
| 524 if (action == "listen") | 525 if (action == "listen") |
| 525 { | 526 { |
| 526 listen(type, filters, message.filter, message, uiPort.sender.tab.id); | 527 listen(type, filters, message.filter, message, uiPort.sender.tab.id); |
| 527 } | 528 } |
| 528 }); | 529 }); |
| 529 } | 530 } |
| 530 | 531 |
| 531 browser.runtime.onConnect.addListener(onConnect); | 532 browser.runtime.onConnect.addListener(onConnect); |
| 532 })(this); | 533 })(this); |
| OLD | NEW |