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

Side by Side Diff: lib/adblockplus.js

Issue 29358502: Issue 4547 - ABP edge 0.9.8 re-adds easylist (Closed)
Patch Set: Created Oct. 21, 2016, 10:38 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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 6137 matching lines...) Expand 10 before | Expand all | Expand 10 after
6148 exports.reinitialized = true; 6148 exports.reinitialized = true;
6149 } 6149 }
6150 Prefs.currentVersion = require("info").addonVersion; 6150 Prefs.currentVersion = require("info").addonVersion;
6151 resolve(); 6151 resolve();
6152 }); 6152 });
6153 }); 6153 });
6154 } 6154 }
6155 6155
6156 function shouldAddDefaultSubscription() 6156 function shouldAddDefaultSubscription()
6157 { 6157 {
6158 // for (var _loopIndex66 = 0; _loopIndex66 < FilterStorage.subscriptions.len gth; ++_loopIndex66) 6158 for (var _loopIndex66 = 0; _loopIndex66 < FilterStorage.subscriptions.length ; ++_loopIndex66)
6159 // { 6159 {
6160 // var subscription = FilterStorage.subscriptions[_loopIndex66]; 6160 var subscription = FilterStorage.subscriptions[_loopIndex66];
6161 // if (subscription instanceof DownloadableSubscription && subscription.ur l != Prefs.subscriptions_exceptionsurl && subscription.url != Prefs.subscription s_antiadblockurl) 6161 if (subscription instanceof DownloadableSubscription && subscription.url ! = Prefs.subscriptions_exceptionsurl && subscription.url != Prefs.subscriptions_a ntiadblockurl)
6162 // { 6162 {
6163 // return false; 6163 return false;
6164 // } 6164 }
6165 // if (subscription instanceof SpecialSubscription && subscription.filters .length > 0) 6165 if (subscription instanceof SpecialSubscription && subscription.filters.le ngth > 0)
6166 // { 6166 {
6167 // return false; 6167 return false;
6168 // } 6168 }
6169 // } 6169 }
6170 return true; 6170 return true;
6171 } 6171 }
6172 6172
6173 function getSubscriptions() 6173 function getSubscriptions()
6174 { 6174 {
6175 return new Promise(function(resolve, reject) { 6175 return new Promise(function(resolve, reject) {
6176 ext.storage.get('MS_EDGE_SHOW_ACCEPTABLE_ADS', function(data) { 6176 ext.storage.get('MS_EDGE_SHOW_ACCEPTABLE_ADS', function(data) {
6177 var shouldShowAcceptableAds = data['MS_EDGE_SHOW_ACCEPTABLE_ADS'] === un defined || data['MS_EDGE_SHOW_ACCEPTABLE_ADS']; 6177 var shouldShowAcceptableAds = data['MS_EDGE_SHOW_ACCEPTABLE_ADS'] === un defined || data['MS_EDGE_SHOW_ACCEPTABLE_ADS'];
6178 var subscriptions = []; 6178 var subscriptions = [];
6179 for (var _loopIndex67 = 0; _loopIndex67 < Prefs.additional_subscriptions .length; ++_loopIndex67) 6179 for (var _loopIndex67 = 0; _loopIndex67 < Prefs.additional_subscriptions .length; ++_loopIndex67)
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
6558 search.push("notificationDownloadCount=" + encodeURIComponent(downlCount)); 6558 search.push("notificationDownloadCount=" + encodeURIComponent(downlCount));
6559 chrome.runtime.setUninstallURL(Utils.getDocLink("uninstalled") + "&" + searc h.join("&")); 6559 chrome.runtime.setUninstallURL(Utils.getDocLink("uninstalled") + "&" + searc h.join("&"));
6560 } 6560 }
6561 if ("setUninstallURL" in chrome.runtime) 6561 if ("setUninstallURL" in chrome.runtime)
6562 { 6562 {
6563 Prefs.untilLoaded.then(setUninstallURL); 6563 Prefs.untilLoaded.then(setUninstallURL);
6564 Prefs.on("notificationdata", setUninstallURL); 6564 Prefs.on("notificationdata", setUninstallURL);
6565 } 6565 }
6566 return exports; 6566 return exports;
6567 })(); 6567 })();
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