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

Delta Between Two Patch Sets: desktop-options.js

Issue 29615620: issue 6075 - Hide Acceptable Ads notification when corresponding subscription is removed (Closed)
Left Patch Set: Addressed Thomas comments Created Nov. 23, 2017, 4:36 p.m.
Right Patch Set: Fixed characters limit Created Nov. 23, 2017, 5 p.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 | « no previous file | no next file » | 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 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 privacyList = subscription; 1113 privacyList = subscription;
1114 break; 1114 break;
1115 } 1115 }
1116 } 1116 }
1117 return acceptableAdsList && acceptableAdsList.disabled == false && 1117 return acceptableAdsList && acceptableAdsList.disabled == false &&
1118 privacyList && privacyList.disabled == false; 1118 privacyList && privacyList.disabled == false;
1119 } 1119 }
1120 1120
1121 function setPrivacyConflict() 1121 function setPrivacyConflict()
1122 { 1122 {
1123 let acceptableAdsForm = E("acceptable-ads");
1123 if (hasPrivacyConflict()) 1124 if (hasPrivacyConflict())
1124 { 1125 {
1125 getPref("ui_warn_tracking", (showTrackingWarning) => 1126 getPref("ui_warn_tracking", (showTrackingWarning) =>
1126 { 1127 {
1127 E("acceptable-ads").classList.toggle("show-warning", showTrackingWarning ); 1128 acceptableAdsForm.classList.toggle("show-warning", showTrackingWarning);
Thomas Greiner 2017/11/23 16:51:30 Coding style: "Line length: 80 characters or less"
saroyanm 2017/11/23 17:01:38 Agree, we used "acceptableAdsForm" below so I'll u
1128 }); 1129 });
1129 } 1130 }
1130 else 1131 else
1131 { 1132 {
1132 E("acceptable-ads").classList.remove("show-warning"); 1133 acceptableAdsForm.classList.remove("show-warning");
1133 } 1134 }
1134 } 1135 }
1135 1136
1136 function populateLists() 1137 function populateLists()
1137 { 1138 {
1138 subscriptionsMap = Object.create(null); 1139 subscriptionsMap = Object.create(null);
1139 filtersMap = Object.create(null); 1140 filtersMap = Object.create(null);
1140 1141
1141 // Empty collections and lists 1142 // Empty collections and lists
1142 for (let property in collections) 1143 for (let property in collections)
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 }); 1467 });
1467 browser.runtime.sendMessage({ 1468 browser.runtime.sendMessage({
1468 type: "subscriptions.listen", 1469 type: "subscriptions.listen",
1469 filter: ["added", "disabled", "homepage", "lastDownload", "removed", 1470 filter: ["added", "disabled", "homepage", "lastDownload", "removed",
1470 "title", "downloadStatus", "downloading"] 1471 "title", "downloadStatus", "downloading"]
1471 }); 1472 });
1472 1473
1473 window.addEventListener("DOMContentLoaded", onDOMLoaded, false); 1474 window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
1474 window.addEventListener("hashchange", onHashChange, false); 1475 window.addEventListener("hashchange", onHashChange, false);
1475 } 1476 }
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld