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

Delta Between Two Patch Sets: background.js

Issue 29733668: Handle disabled state of AA
Left Patch Set: Hide toggle button when AA is enabled (Manvel Suggestion) Created March 26, 2018, 9 p.m.
Right Patch Set: Created March 26, 2018, 9:23 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | js/desktop-options.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
(no file at all)
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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 }; 161 };
162 162
163 let subscriptionDetails = { 163 let subscriptionDetails = {
164 [easyListGermany]: { 164 [easyListGermany]: {
165 title: "EasyList Germany+EasyList", 165 title: "EasyList Germany+EasyList",
166 filters: ["-ad-banner.", "-ad-big.", "-ad-bottom-", "-ad-button-"], 166 filters: ["-ad-banner.", "-ad-big.", "-ad-bottom-", "-ad-button-"],
167 installed: true 167 installed: true
168 }, 168 },
169 [acceptableAds]: { 169 [acceptableAds]: {
170 title: "Allow non-intrusive advertising", 170 title: "Allow non-intrusive advertising",
171 installed: true 171 installed: true,
172 disabled: true
172 }, 173 },
173 [acceptableAdsPrivacyFriendly]: { 174 [acceptableAdsPrivacyFriendly]: {
174 title: "Allow only nonintrusive ads that are privacy-friendly" 175 title: "Allow only nonintrusive ads that are privacy-friendly"
175 }, 176 },
176 [`${subscriptionServer}/fanboy-social.txt`]: { 177 [`${subscriptionServer}/fanboy-social.txt`]: {
177 title: "Fanboy's Social Blocking List", 178 title: "Fanboy's Social Blocking List",
178 installed: true 179 installed: true
179 }, 180 },
180 [`${subscriptionServer}/antiadblockfilters.txt`]: { 181 [`${subscriptionServer}/antiadblockfilters.txt`]: {
181 title: "Adblock Warning Removal List", 182 title: "Adblock Warning Removal List",
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 }, 629 },
629 filter: { 630 filter: {
630 text: "||example.com/some-annoying-popup$popup", 631 text: "||example.com/some-annoying-popup$popup",
631 whitelisted: false, 632 whitelisted: false,
632 userDefined: true, 633 userDefined: true,
633 subscription: null 634 subscription: null
634 } 635 }
635 }); 636 });
636 }); 637 });
637 }()); 638 }());
LEFTRIGHT

Powered by Google App Engine
This is Rietveld