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

Side by Side Diff: lib/subscriptionClasses.js

Issue 30009567: Issue 7295 - Add non-active filters to blocking group (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Feb. 16, 2019, 2:17 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 | « no previous file | test/filterStorage.js » ('j') | test/filterStorage.js » ('J')
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-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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 * @return {boolean} 370 * @return {boolean}
371 */ 371 */
372 isDefaultFor(filter) 372 isDefaultFor(filter)
373 { 373 {
374 if (this.defaults && this.defaults.length) 374 if (this.defaults && this.defaults.length)
375 { 375 {
376 for (let type of this.defaults) 376 for (let type of this.defaults)
377 { 377 {
378 if (filter instanceof SpecialSubscription.defaultsMap.get(type)) 378 if (filter instanceof SpecialSubscription.defaultsMap.get(type))
379 return true; 379 return true;
380 if (!(filter instanceof ActiveFilter) && type == "blacklist") 380 if (!(filter instanceof ActiveFilter) && type == "blocking")
381 return true; 381 return true;
382 } 382 }
383 } 383 }
384 384
385 return false; 385 return false;
386 }, 386 },
387 387
388 /** 388 /**
389 * See Subscription.serialize() 389 * See Subscription.serialize()
390 * @inheritdoc 390 * @inheritdoc
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 if (errors) 686 if (errors)
687 yield "errors=" + errors; 687 yield "errors=" + errors;
688 if (version) 688 if (version)
689 yield "version=" + version; 689 yield "version=" + version;
690 if (requiredVersion) 690 if (requiredVersion)
691 yield "requiredVersion=" + requiredVersion; 691 yield "requiredVersion=" + requiredVersion;
692 if (downloadCount) 692 if (downloadCount)
693 yield "downloadCount=" + downloadCount; 693 yield "downloadCount=" + downloadCount;
694 } 694 }
695 }); 695 });
OLDNEW
« no previous file with comments | « no previous file | test/filterStorage.js » ('j') | test/filterStorage.js » ('J')

Powered by Google App Engine
This is Rietveld