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

Delta Between Two Patch Sets: background.js

Issue 29712664: Issue 6432 - Hide remove button for additional filter lists (Closed)
Left Patch Set: Addressed Dave's comments Created March 2, 2018, 11:43 a.m.
Right Patch Set: Reverted the colors back Created March 9, 2018, 11:25 a.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 | « README.md ('k') | css/desktop-options.scss » ('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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 for (let param of params) 61 for (let param of params)
62 { 62 {
63 let parts = param.split("=", 2); 63 let parts = param.split("=", 2);
64 if (parts.length == 2 && parts[0] in data) 64 if (parts.length == 2 && parts[0] in data)
65 data[parts[0]] = decodeURIComponent(parts[1]); 65 data[parts[0]] = decodeURIComponent(parts[1]);
66 } 66 }
67 } 67 }
68 } 68 }
69 69
70 let params = { 70 let params = {
71 additionalSubscriptions: false, 71 additionalSubscriptions: "",
72 blockedURLs: "", 72 blockedURLs: "",
73 filterlistsReinitialized: false, 73 filterlistsReinitialized: false,
74 addSubscription: false, 74 addSubscription: false,
75 filterError: false, 75 filterError: false,
76 downloadStatus: "synchronize_ok", 76 downloadStatus: "synchronize_ok",
77 showNotificationUI: false, 77 showNotificationUI: false,
78 showPageOptions: false 78 showPageOptions: false
79 }; 79 };
80 updateFromURL(params); 80 updateFromURL(params);
81 81
(...skipping 27 matching lines...) Expand all
109 } 109 }
110 }; 110 };
111 111
112 modules.prefs = {Prefs: new EventEmitter()}; 112 modules.prefs = {Prefs: new EventEmitter()};
113 let prefs = { 113 let prefs = {
114 notifications_ignoredcategories: params.showNotificationUI ? ["*"] : [], 114 notifications_ignoredcategories: params.showNotificationUI ? ["*"] : [],
115 notifications_showui: params.showNotificationUI, 115 notifications_showui: params.showNotificationUI,
116 shouldShowBlockElementMenu: true, 116 shouldShowBlockElementMenu: true,
117 show_devtools_panel: true, 117 show_devtools_panel: true,
118 ui_warn_tracking: true, 118 ui_warn_tracking: true,
119 additional_subscriptions: 119 additional_subscriptions: params.additionalSubscriptions.split(","),
120 params.additionalSubscriptions ? [`${easyListGermany}`] : [],
121 subscriptions_exceptionsurl: acceptableAds, 120 subscriptions_exceptionsurl: acceptableAds,
122 subscriptions_exceptionsurl_privacy: acceptableAdsPrivacyFriendly 121 subscriptions_exceptionsurl_privacy: acceptableAdsPrivacyFriendly
123 }; 122 };
124 for (let key of Object.keys(prefs)) 123 for (let key of Object.keys(prefs))
125 { 124 {
126 Object.defineProperty(modules.prefs.Prefs, key, { 125 Object.defineProperty(modules.prefs.Prefs, key, {
127 get() 126 get()
128 { 127 {
129 return prefs[key]; 128 return prefs[key];
130 }, 129 },
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 }, 620 },
622 filter: { 621 filter: {
623 text: "||example.com/some-annoying-popup$popup", 622 text: "||example.com/some-annoying-popup$popup",
624 whitelisted: false, 623 whitelisted: false,
625 userDefined: true, 624 userDefined: true,
626 subscription: null 625 subscription: null
627 } 626 }
628 }); 627 });
629 }); 628 });
630 }()); 629 }());
LEFTRIGHT

Powered by Google App Engine
This is Rietveld