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

Delta Between Two Patch Sets: lib/requestBlocker.js

Issue 29907589: Issue 7054 - Update the adblockpluscore dependency to 5cb695da5a40, adblockplusui to f86abf2efdfd (Closed)
Left Patch Set: Add all the changes Created Nov. 29, 2018, 5:29 p.m.
Right Patch Set: Address PS12 Comment Created Jan. 8, 2019, 1:02 a.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
« no previous file with change/comment | « lib/indexedDBBackup.js ('k') | lib/subscriptionInit.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 if (ignoreFilterNotifications) 296 if (ignoreFilterNotifications)
297 return; 297 return;
298 298
299 // Ignore disabled subscriptions and filters, unless they just got 299 // Ignore disabled subscriptions and filters, unless they just got
300 // disabled, otherwise they have no effect on the handler behavior. 300 // disabled, otherwise they have no effect on the handler behavior.
301 if (arg && arg.disabled && !isDisabledAction) 301 if (arg && arg.disabled && !isDisabledAction)
302 return; 302 return;
303 303
304 // Ignore empty subscriptions. This includes subscriptions 304 // Ignore empty subscriptions. This includes subscriptions
305 // that have just been added, but not downloaded yet. 305 // that have just been added, but not downloaded yet.
306 if (arg instanceof Subscription && arg.filters.length == 0) 306 if (arg instanceof Subscription && arg.filterCount == 0)
307 return; 307 return;
308 308
309 // Ignore all types of filters but request filters, 309 // Ignore all types of filters but request filters,
310 // only these have an effect on the handler behavior. 310 // only these have an effect on the handler behavior.
311 if (arg instanceof Filter && !(arg instanceof RegExpFilter)) 311 if (arg instanceof Filter && !(arg instanceof RegExpFilter))
312 return; 312 return;
313 313
314 ignoreFilterNotifications = true; 314 ignoreFilterNotifications = true;
315 setTimeout(() => 315 setTimeout(() =>
316 { 316 {
(...skipping 12 matching lines...) Expand all
329 } 329 }
330 330
331 filterNotifier.on("subscription.added", onFilterChange); 331 filterNotifier.on("subscription.added", onFilterChange);
332 filterNotifier.on("subscription.removed", arg => onFilterChange(arg, false)); 332 filterNotifier.on("subscription.removed", arg => onFilterChange(arg, false));
333 filterNotifier.on("subscription.updated", onFilterChange); 333 filterNotifier.on("subscription.updated", onFilterChange);
334 filterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true)); 334 filterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
335 filterNotifier.on("filter.added", onFilterChange); 335 filterNotifier.on("filter.added", onFilterChange);
336 filterNotifier.on("filter.removed", onFilterChange); 336 filterNotifier.on("filter.removed", onFilterChange);
337 filterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); 337 filterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
338 filterNotifier.on("load", onFilterChange); 338 filterNotifier.on("load", onFilterChange);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld