Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 Cu.import("resource://gre/modules/Services.jsm"); | 18 Cu.import("resource://gre/modules/Services.jsm"); |
19 | 19 |
20 let {Utils} = require("utils"); | 20 let {Utils} = require("utils"); |
21 let {Prefs} = require("prefs"); | 21 let {Prefs} = require("prefs"); |
22 let {ActiveFilter} = require("filterClasses"); | 22 let {ActiveFilter} = require("filterClasses"); |
23 let {FilterStorage} = require("filterStorage"); | 23 let {FilterStorage} = require("filterStorage"); |
24 let {FilterNotifier} = require("filterNotifier"); | 24 let {FilterNotifier} = require("filterNotifier"); |
25 let {Subscription} = require("subscriptionClasses"); | 25 let {Subscription} = require("subscriptionClasses"); |
26 let {Notification} = require("notification"); | 26 let {Notification} = require("notification"); |
27 | 27 |
28 let ext = typeof window != "undefined" && | 28 let ext; |
kzar
2017/03/02 09:36:30
I'm not sure this is right, since if ext is alread
Wladimir Palant
2017/03/02 11:14:39
This part is unproblematic, it's a module which me
Thomas Greiner
2017/03/02 11:41:16
I assume the confusion here comes from the fact th
wspee
2017/03/03 09:25:21
Done. Any objections?
| |
29 window.ext || require("ext_background"); | 29 if (typeof window != "undefined" && window.ext) |
30 ext = window.ext; | |
31 else | |
32 ext = require("ext_background"); | |
30 | 33 |
31 exports.initAntiAdblockNotification = function initAntiAdblockNotification() | 34 exports.initAntiAdblockNotification = function initAntiAdblockNotification() |
32 { | 35 { |
33 let notification = { | 36 let notification = { |
34 id: "antiadblock", | 37 id: "antiadblock", |
35 type: "question", | 38 type: "question", |
36 title: ext.i18n.getMessage("notification_antiadblock_title"), | 39 title: ext.i18n.getMessage("notification_antiadblock_title"), |
37 message: ext.i18n.getMessage("notification_antiadblock_message"), | 40 message: ext.i18n.getMessage("notification_antiadblock_message"), |
38 urlFilters: [] | 41 urlFilters: [] |
39 }; | 42 }; |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
84 if (url in FilterStorage.knownSubscriptions && !subscription.disabled) | 87 if (url in FilterStorage.knownSubscriptions && !subscription.disabled) |
85 addAntiAdblockNotification(subscription); | 88 addAntiAdblockNotification(subscription); |
86 else | 89 else |
87 removeAntiAdblockNotification(); | 90 removeAntiAdblockNotification(); |
88 } | 91 } |
89 | 92 |
90 FilterNotifier.on("subscription.updated", onSubscriptionChange); | 93 FilterNotifier.on("subscription.updated", onSubscriptionChange); |
91 FilterNotifier.on("subscription.removed", onSubscriptionChange); | 94 FilterNotifier.on("subscription.removed", onSubscriptionChange); |
92 FilterNotifier.on("subscription.disabled", onSubscriptionChange); | 95 FilterNotifier.on("subscription.disabled", onSubscriptionChange); |
93 } | 96 } |
LEFT | RIGHT |