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

Delta Between Two Patch Sets: lib/subscriptionInit.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:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/requestBlocker.js ('k') | lib/whitelisting.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
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 { 73 {
74 for (let subscription of filterStorage.subscriptions()) 74 for (let subscription of filterStorage.subscriptions())
75 { 75 {
76 if (subscription instanceof DownloadableSubscription && 76 if (subscription instanceof DownloadableSubscription &&
77 subscription.url != Prefs.subscriptions_exceptionsurl && 77 subscription.url != Prefs.subscriptions_exceptionsurl &&
78 subscription.url != Prefs.subscriptions_antiadblockurl && 78 subscription.url != Prefs.subscriptions_antiadblockurl &&
79 subscription.type != "circumvention") 79 subscription.type != "circumvention")
80 return false; 80 return false;
81 81
82 if (subscription instanceof SpecialSubscription && 82 if (subscription instanceof SpecialSubscription &&
83 subscription.filters.length > 0) 83 subscription.filterCount > 0)
84 return false; 84 return false;
85 } 85 }
86 86
87 return true; 87 return true;
88 } 88 }
89 89
90 /** 90 /**
91 * @typedef {object} DefaultSubscriptions 91 * @typedef {object} DefaultSubscriptions
92 * @property {?Element} ads 92 * @property {?Element} ads
93 * @property {?Element} circumvention 93 * @property {?Element} circumvention
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 * 334 *
335 * @param {function} callback 335 * @param {function} callback
336 */ 336 */
337 exports.setSubscriptionsCallback = callback => 337 exports.setSubscriptionsCallback = callback =>
338 { 338 {
339 subscriptionsCallback = callback; 339 subscriptionsCallback = callback;
340 }; 340 };
341 341
342 // Exports for tests only 342 // Exports for tests only
343 exports.chooseFilterSubscriptions = chooseFilterSubscriptions; 343 exports.chooseFilterSubscriptions = chooseFilterSubscriptions;
LEFTRIGHT

Powered by Google App Engine
This is Rietveld