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

Delta Between Two Patch Sets: lib/filterListener.js

Issue 29886685: Issue 6856 - Remove FilterStorage.moveSubscription (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore
Left Patch Set: Created Sept. 20, 2018, 7:33 p.m.
Right Patch Set: Address PS7 comments Created Oct. 2, 2018, 4:09 p.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 | « no previous file | lib/filterStorage.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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 let allowSnippets = false; 144 let allowSnippets = false;
145 for (let subscription of filter.subscriptions()) 145 for (let subscription of filter.subscriptions())
146 { 146 {
147 if (!subscription.disabled) 147 if (!subscription.disabled)
148 { 148 {
149 hasEnabled = true; 149 hasEnabled = true;
150 150
151 // Allow snippets to be executed only by the circumvention lists or the 151 // Allow snippets to be executed only by the circumvention lists or the
152 // user's own filters. 152 // user's own filters.
153 if (subscription.type == "circumvention" || 153 if (subscription.type == "circumvention" ||
154 subscription.url == "https://easylist-downloads.adblockplus.org/abp-fi lters-anti-cv.txt" ||
154 subscription instanceof SpecialSubscription) 155 subscription instanceof SpecialSubscription)
155 { 156 {
156 allowSnippets = true; 157 allowSnippets = true;
157 break; 158 break;
158 } 159 }
159 } 160 }
160 } 161 }
161 if (!hasEnabled) 162 if (!hasEnabled)
162 return; 163 return;
163 164
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 { 340 {
340 if (!subscription.disabled) 341 if (!subscription.disabled)
341 addFilters(subscription.filters); 342 addFilters(subscription.filters);
342 } 343 }
343 } 344 }
344 345
345 function onSave() 346 function onSave()
346 { 347 {
347 isDirty = 0; 348 isDirty = 0;
348 } 349 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld