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

Side by Side Diff: lib/notification.js

Issue 29321478: Issue 2738 - Make RegExpFilter.matches() take a bit mask instead of content type string (Closed)
Patch Set: Changed API as discussed and addressed feedback Created July 12, 2015, 1:55 p.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 | « lib/matcher.js ('k') | 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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 /** 18 /**
19 * @fileOverview Handles notifications. 19 * @fileOverview Handles notifications.
20 */ 20 */
21 21
22 Cu.import("resource://gre/modules/Services.jsm"); 22 Cu.import("resource://gre/modules/Services.jsm");
23 23
24 let {Prefs} = require("prefs"); 24 let {Prefs} = require("prefs");
25 let {Downloader, Downloadable, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader"); 25 let {Downloader, Downloadable, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
26 let {Utils} = require("utils"); 26 let {Utils} = require("utils");
27 let {Matcher} = require("matcher"); 27 let {Matcher} = require("matcher");
28 let {Filter} = require("filterClasses"); 28 let {Filter, RegExpFilter} = require("filterClasses");
29 29
30 let INITIAL_DELAY = 1 * MILLIS_IN_MINUTE; 30 let INITIAL_DELAY = 1 * MILLIS_IN_MINUTE;
31 let CHECK_INTERVAL = 1 * MILLIS_IN_HOUR; 31 let CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
32 let EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY; 32 let EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
33 let TYPE = { 33 let TYPE = {
34 information: 0, 34 information: 0,
35 question: 1, 35 question: 1,
36 critical: 2 36 critical: 2
37 }; 37 };
38 38
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 continue; 215 continue;
216 } 216 }
217 217
218 if (typeof url === "string" || notification.urlFilters instanceof Array) 218 if (typeof url === "string" || notification.urlFilters instanceof Array)
219 { 219 {
220 if (typeof url === "string" && notification.urlFilters instanceof Array) 220 if (typeof url === "string" && notification.urlFilters instanceof Array)
221 { 221 {
222 let matcher = new Matcher(); 222 let matcher = new Matcher();
223 for (let urlFilter of notification.urlFilters) 223 for (let urlFilter of notification.urlFilters)
224 matcher.add(Filter.fromText(urlFilter)); 224 matcher.add(Filter.fromText(urlFilter));
225 if (!matcher.matchesAny(url, "DOCUMENT", url)) 225 if (!matcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, url))
226 continue; 226 continue;
227 } 227 }
228 else 228 else
229 continue; 229 continue;
230 } 230 }
231 231
232 if (notification.targets instanceof Array) 232 if (notification.targets instanceof Array)
233 { 233 {
234 let match = false; 234 let match = false;
235 for (let target of notification.targets) 235 for (let target of notification.targets)
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 Prefs.notifications_showui = true; 384 Prefs.notifications_showui = true;
385 } 385 }
386 else if (index != -1 && forceValue !== true) 386 else if (index != -1 && forceValue !== true)
387 categories.splice(index, 1); 387 categories.splice(index, 1);
388 388
389 // HACK: JSON values aren't saved unless they are assigned a different objec t. 389 // HACK: JSON values aren't saved unless they are assigned a different objec t.
390 Prefs.notifications_ignoredcategories = JSON.parse(JSON.stringify(categories )); 390 Prefs.notifications_ignoredcategories = JSON.parse(JSON.stringify(categories ));
391 } 391 }
392 }; 392 };
393 Notification.init(); 393 Notification.init();
OLDNEW
« no previous file with comments | « lib/matcher.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld