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

Delta Between Two Patch Sets: lib/notification.js

Issue 29556737: Issue 5141 - Convert filter match to C++ (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Some more cleanup Created Sept. 29, 2017, 4:12 p.m.
Right Patch Set: Fixed many issues. One test left out. Created Oct. 6, 2017, 1:45 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
LEFTRIGHT
(no file at all)
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
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 { 266 {
267 host = ""; 267 host = "";
268 } 268 }
269 269
270 let exception = defaultMatcher.matchesAny( 270 let exception = defaultMatcher.matchesAny(
271 url, RegExpFilter.typeMap.DOCUMENT, host, false, null 271 url, RegExpFilter.typeMap.DOCUMENT, host, false, null
272 ); 272 );
273 if (exception instanceof WhitelistFilter) 273 if (exception instanceof WhitelistFilter)
274 continue; 274 continue;
275 275
276 let matcher = new Matcher(); 276 let matcher = Matcher.create();
277 for (let urlFilter of notification.urlFilters) 277 for (let urlFilter of notification.urlFilters)
278 matcher.add(Filter.fromText(urlFilter)); 278 matcher.add(Filter.fromText(urlFilter));
279 if (!matcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, host, 279 if (!matcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, host,
280 false, null)) 280 false, null))
281 { 281 {
282 continue; 282 continue;
283 } 283 }
284 } 284 }
285 else 285 else
286 continue; 286 continue;
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 else if (index != -1 && forceValue !== true) 466 else if (index != -1 && forceValue !== true)
467 categories.splice(index, 1); 467 categories.splice(index, 1);
468 468
469 // HACK: JSON values aren't saved unless they are assigned a 469 // HACK: JSON values aren't saved unless they are assigned a
470 // different object. 470 // different object.
471 Prefs.notifications_ignoredcategories = 471 Prefs.notifications_ignoredcategories =
472 JSON.parse(JSON.stringify(categories)); 472 JSON.parse(JSON.stringify(categories));
473 } 473 }
474 }; 474 };
475 Notification.init(); 475 Notification.init();
LEFTRIGHT

Powered by Google App Engine
This is Rietveld