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

Side by Side Diff: background.js

Issue 29555827: Noissue - use actual privacy friendly Acceptable Ads url in the test environment (Closed)
Patch Set: Created Sept. 25, 2017, 5:10 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 | 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 }; 102 };
103 103
104 modules.prefs = {Prefs: new EventEmitter()}; 104 modules.prefs = {Prefs: new EventEmitter()};
105 let prefs = { 105 let prefs = {
106 notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [], 106 notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [],
107 notifications_showui: params.showNotificationUI, 107 notifications_showui: params.showNotificationUI,
108 shouldShowBlockElementMenu: true, 108 shouldShowBlockElementMenu: true,
109 show_devtools_panel: true, 109 show_devtools_panel: true,
110 ui_warn_tracking: true, 110 ui_warn_tracking: true,
111 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exc eptionrules.txt", 111 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exc eptionrules.txt",
112 subscriptions_exceptionsurl_privacy: "https://easylist-downloads.adblockplus .org/exceptionrules-privacy.txt" 112 subscriptions_exceptionsurl_privacy: "https://easylist-downloads.adblockplus .org/exceptionrules-privacy-friendly.txt"
113 }; 113 };
114 for (let key of Object.keys(prefs)) 114 for (let key of Object.keys(prefs))
115 { 115 {
116 Object.defineProperty(modules.prefs.Prefs, key, { 116 Object.defineProperty(modules.prefs.Prefs, key, {
117 get() 117 get()
118 { 118 {
119 return prefs[key]; 119 return prefs[key];
120 }, 120 },
121 set(value) 121 set(value)
122 { 122 {
(...skipping 21 matching lines...) Expand all
144 let subscriptionServer = "https://easylist-downloads.adblockplus.org"; 144 let subscriptionServer = "https://easylist-downloads.adblockplus.org";
145 let subscriptionDetails = { 145 let subscriptionDetails = {
146 [`${subscriptionServer}/easylistgermany+easylist.txt`]: { 146 [`${subscriptionServer}/easylistgermany+easylist.txt`]: {
147 title: "EasyList Germany+EasyList", 147 title: "EasyList Germany+EasyList",
148 installed: true 148 installed: true
149 }, 149 },
150 [`${subscriptionServer}/exceptionrules.txt`]: { 150 [`${subscriptionServer}/exceptionrules.txt`]: {
151 title: "Allow non-intrusive advertising", 151 title: "Allow non-intrusive advertising",
152 installed: true 152 installed: true
153 }, 153 },
154 [`${subscriptionServer}/exceptionrules-privacy.txt`]: { 154 [`${subscriptionServer}/exceptionrules-privacy-friendly.txt`]: {
155 title: "Allow only nonintrusive ads that are privacy-friendly" 155 title: "Allow only nonintrusive ads that are privacy-friendly"
156 }, 156 },
157 [`${subscriptionServer}/fanboy-social.txt`]: { 157 [`${subscriptionServer}/fanboy-social.txt`]: {
158 title: "Fanboy's Social Blocking List", 158 title: "Fanboy's Social Blocking List",
159 installed: true 159 installed: true
160 }, 160 },
161 [`${subscriptionServer}/antiadblockfilters.txt`]: { 161 [`${subscriptionServer}/antiadblockfilters.txt`]: {
162 title: "Adblock Warning Removal List", 162 title: "Adblock Warning Removal List",
163 installed: true, 163 installed: true,
164 disabled: true 164 disabled: true
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 }, 595 },
596 filter: { 596 filter: {
597 text: "||example.com/some-annoying-popup$popup", 597 text: "||example.com/some-annoying-popup$popup",
598 whitelisted: false, 598 whitelisted: false,
599 userDefined: true, 599 userDefined: true,
600 subscription: null 600 subscription: null
601 } 601 }
602 }); 602 });
603 }); 603 });
604 }()); 604 }());
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld