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

Side by Side Diff: lib/antiadblockInit.js

Issue 6242239667765248: Issue 196 - Adblock Plus startup is broken, new profiles are left uninitialized (Closed)
Patch Set: Created March 25, 2014, 7:12 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 <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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 {FilterStorage} = require("filterStorage"); 23 let {FilterStorage} = require("filterStorage");
23 let {FilterNotifier} = require("filterNotifier"); 24 let {FilterNotifier} = require("filterNotifier");
24 let {Subscription} = require("subscriptionClasses"); 25 let {Subscription} = require("subscriptionClasses");
25 let {Notification} = require("notification"); 26 let {Notification} = require("notification");
26 27
27 exports.initAntiAdblockNotification = function initAntiAdblockNotification() 28 exports.initAntiAdblockNotification = function initAntiAdblockNotification()
28 { 29 {
29 let notification = { 30 let notification = {
30 id: "antiadblock", 31 id: "antiadblock",
31 type: "question", 32 type: "question",
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 { 69 {
69 if (!/^subscription\.(updated|removed|disabled)$/.test(action) || value.url != Prefs.subscriptions_antiadblockurl) 70 if (!/^subscription\.(updated|removed|disabled)$/.test(action) || value.url != Prefs.subscriptions_antiadblockurl)
70 return; 71 return;
71 72
72 if (action == "subscription.updated") 73 if (action == "subscription.updated")
73 addAntiAdblockNotification(value); 74 addAntiAdblockNotification(value);
74 else if (action == "subscription.removed" || (action == "subscription.disabl ed" && !value.disabled)) 75 else if (action == "subscription.removed" || (action == "subscription.disabl ed" && !value.disabled))
75 removeAntiAdblockNotification(); 76 removeAntiAdblockNotification();
76 }); 77 });
77 } 78 }
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