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

Delta Between Two Patch Sets: background.js

Issue 29519669: Issue 5539 - Implement "Acceptable Ads notification" (Closed)
Left Patch Set: Rebased Created Sept. 14, 2017, 2:29 p.m.
Right Patch Set: Addressed Thomas comment from patchset 6 Created Sept. 22, 2017, 10:28 a.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 | locale/en-US/new-options.json » ('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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 100 }
101 } 101 }
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 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exc eptionrules.txt", 111 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exc eptionrules.txt",
111 subscriptions_exceptionsurl_privacy: "https://easylist-downloads.adblockplus .org/exceptionrules-privacy.txt" 112 subscriptions_exceptionsurl_privacy: "https://easylist-downloads.adblockplus .org/exceptionrules-privacy.txt"
112 }; 113 };
113 for (let key of Object.keys(prefs)) 114 for (let key of Object.keys(prefs))
114 { 115 {
115 Object.defineProperty(modules.prefs.Prefs, key, { 116 Object.defineProperty(modules.prefs.Prefs, key, {
116 get() 117 get()
117 { 118 {
118 return prefs[key]; 119 return prefs[key];
119 }, 120 },
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 }, 604 },
604 filter: { 605 filter: {
605 text: "||example.com/some-annoying-popup$popup", 606 text: "||example.com/some-annoying-popup$popup",
606 whitelisted: false, 607 whitelisted: false,
607 userDefined: true, 608 userDefined: true,
608 subscription: null 609 subscription: null
609 } 610 }
610 }); 611 });
611 }); 612 });
612 }()); 613 }());
LEFTRIGHT

Powered by Google App Engine
This is Rietveld