Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/antiadblockInit.js

Issue 29388555: Issue 5014 - Fix "Hide targeted messages?" notification (Closed)
Patch Set: Created March 19, 2017, 6:27 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "use strict"; 18 "use strict";
19 19
20 const {Prefs} = require("prefs"); 20 const {Prefs} = require("prefs");
21 const {ActiveFilter} = require("filterClasses"); 21 const {ActiveFilter} = require("filterClasses");
22 const {FilterStorage} = require("filterStorage"); 22 const {FilterStorage} = require("filterStorage");
23 const {FilterNotifier} = require("filterNotifier"); 23 const {FilterNotifier} = require("filterNotifier");
24 const {Subscription} = require("subscriptionClasses"); 24 const {Subscription} = require("subscriptionClasses");
25 const {Notification} = require("notification"); 25 const {Notification} = require("notification");
26 const {Utils} = require("utils");
26 27
27 let ext; 28 let ext;
28 if (typeof window != "undefined" && window.ext) 29 if (typeof window != "undefined" && window.ext)
29 ({ext} = window); 30 ({ext} = window);
30 else 31 else
31 ext = require("ext_background"); 32 ext = require("ext_background");
32 33
33 exports.initAntiAdblockNotification = function initAntiAdblockNotification() 34 exports.initAntiAdblockNotification = function initAntiAdblockNotification()
34 { 35 {
35 let notification = { 36 let notification = {
36 id: "antiadblock", 37 id: "antiadblock",
37 type: "question", 38 type: "question",
38 title: ext.i18n.getMessage("notification_antiadblock_title"), 39 title: Utils.getString("notification_antiadblock_title"),
39 message: ext.i18n.getMessage("notification_antiadblock_message"), 40 message: Utils.getString("notification_antiadblock_message"),
40 urlFilters: [] 41 urlFilters: []
41 }; 42 };
42 43
43 function notificationListener(approved) 44 function notificationListener(approved)
44 { 45 {
45 let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl); 46 let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
46 if (subscription.url in FilterStorage.knownSubscriptions) 47 if (subscription.url in FilterStorage.knownSubscriptions)
47 subscription.disabled = !approved; 48 subscription.disabled = !approved;
48 } 49 }
49 50
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 if (url in FilterStorage.knownSubscriptions && !subscription.disabled) 90 if (url in FilterStorage.knownSubscriptions && !subscription.disabled)
90 addAntiAdblockNotification(subscription); 91 addAntiAdblockNotification(subscription);
91 else 92 else
92 removeAntiAdblockNotification(); 93 removeAntiAdblockNotification();
93 } 94 }
94 95
95 FilterNotifier.on("subscription.updated", onSubscriptionChange); 96 FilterNotifier.on("subscription.updated", onSubscriptionChange);
96 FilterNotifier.on("subscription.removed", onSubscriptionChange); 97 FilterNotifier.on("subscription.removed", onSubscriptionChange);
97 FilterNotifier.on("subscription.disabled", onSubscriptionChange); 98 FilterNotifier.on("subscription.disabled", onSubscriptionChange);
98 }; 99 };
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld