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

Side by Side Diff: lib/prefs.js

Issue 29827646: Issue 6783 - opt-in to anti circumvention filter list on upgrade (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Don't re-ad default easylist Created July 12, 2018, 5:13 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 | lib/subscriptionInit.js » ('j') | lib/subscriptionInit.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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 * @see https://adblockplus.org/en/preferences#subscriptions_exceptionsurl_priva cy 93 * @see https://adblockplus.org/en/preferences#subscriptions_exceptionsurl_priva cy
94 * @type {string} 94 * @type {string}
95 */ 95 */
96 defaults.subscriptions_exceptionsurl_privacy = "https://easylist-downloads.adblo ckplus.org/exceptionrules-privacy-friendly.txt"; 96 defaults.subscriptions_exceptionsurl_privacy = "https://easylist-downloads.adblo ckplus.org/exceptionrules-privacy-friendly.txt";
97 /** 97 /**
98 * @see https://adblockplus.org/en/preferences#subscriptions_antiadblockurl 98 * @see https://adblockplus.org/en/preferences#subscriptions_antiadblockurl
99 * @type {string} 99 * @type {string}
100 */ 100 */
101 defaults.subscriptions_antiadblockurl = "https://easylist-downloads.adblockplus. org/antiadblockfilters.txt"; 101 defaults.subscriptions_antiadblockurl = "https://easylist-downloads.adblockplus. org/antiadblockfilters.txt";
102 /** 102 /**
103 * Used to ensure the Anti Circumvention subscription is opted in by default.
104 * @type {boolean}
105 */
106 defaults.subscriptions_checkedanticv = false;
107 /**
103 * @see https://adblockplus.org/en/preferences#documentation_link 108 * @see https://adblockplus.org/en/preferences#documentation_link
104 * @type {string} 109 * @type {string}
105 */ 110 */
106 defaults.documentation_link = "https://adblockplus.org/redirect?link=%LINK%&lang =%LANG%"; 111 defaults.documentation_link = "https://adblockplus.org/redirect?link=%LINK%&lang =%LANG%";
107 /** 112 /**
108 * @see https://adblockplus.org/en/preferences#notificationdata 113 * @see https://adblockplus.org/en/preferences#notificationdata
109 * @type {object} 114 * @type {object}
110 */ 115 */
111 defaults.notificationdata = {}; 116 defaults.notificationdata = {};
112 /** 117 /**
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 eventEmitter.emit(pref); 387 eventEmitter.emit(pref);
383 } 388 }
384 } 389 }
385 }); 390 });
386 } 391 }
387 392
388 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded); 393 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded);
389 } 394 }
390 395
391 init(); 396 init();
OLDNEW
« no previous file with comments | « no previous file | lib/subscriptionInit.js » ('j') | lib/subscriptionInit.js » ('J')

Powered by Google App Engine
This is Rietveld