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

Side by Side Diff: lib/prefs.js

Issue 29613772: Issue 6042 - Introduce ui_warn_tracking boolean preference and updated adbockplusui dependency to... (Closed)
Patch Set: Updated the dependency of adblockplusui Created Nov. 22, 2017, 10:47 a.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 | « dependencies ('k') | no next file » | no next file with comments »
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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 */ 146 */
147 defaults.hidePlaceholders = true; 147 defaults.hidePlaceholders = true;
148 148
149 /** 149 /**
150 * Whether notification opt-out UI should be shown. 150 * Whether notification opt-out UI should be shown.
151 * @type {boolean} 151 * @type {boolean}
152 */ 152 */
153 defaults.notifications_showui = false; 153 defaults.notifications_showui = false;
154 154
155 /** 155 /**
156 * Whether to show tracking warning in options page when both
157 * Acceptable Ads and subscription of type "Privacy" are enabled.
158 *
159 * @type {boolean}
160 */
161 defaults.ui_warn_tracking = true;
162
163 /**
156 * Determines whether data has been cleaned up after upgrading from the legacy 164 * Determines whether data has been cleaned up after upgrading from the legacy
157 * extension on Firefox. 165 * extension on Firefox.
158 * 166 *
159 * @type {boolean} 167 * @type {boolean}
160 */ 168 */
161 defaults.data_cleanup_done = false; 169 defaults.data_cleanup_done = false;
162 170
163 /** 171 /**
164 * Notification categories to be ignored. 172 * Notification categories to be ignored.
165 * 173 *
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 eventEmitter.emit(pref); 372 eventEmitter.emit(pref);
365 } 373 }
366 } 374 }
367 }); 375 });
368 } 376 }
369 377
370 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded); 378 Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded);
371 } 379 }
372 380
373 init(); 381 init();
OLDNEW
« no previous file with comments | « dependencies ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld