Commit 1d3c9f3f authored by Sebastian Noack's avatar Sebastian Noack

Noissue - Merged next into master

parents ca162c5a e71f9f5b
Pipeline #63619609 passed with stages
in 8 minutes and 31 seconds
package-lock=false
_root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
_self = buildtools/ensure_dependencies.py
buildtools = buildtools hg:0ebf8cd23b36 git:04d50e0
adblockpluscore = adblockpluscore hg:e64df38221a3 git:52cdc62
adblockplusui = adblockplusui hg:e1eb6e993ab8 git:8774527
adblockpluscore = adblockpluscore hg:3c40e08b7eaa git:1ea9471
adblockplusui = adblockplusui hg:238bac6af317 git:b9a5480
......@@ -108,6 +108,12 @@ filterNotifier.on("page.WhitelistingStateRevalidate", (page, filter) =>
function renderFrames(notificationType)
{
// Miscosoft Edge 44.17763.1.0 doesn't support passing imageData and
// requires the path argument so, instead of animating the icon,
// we just toggle it.
if (info.platform == "edgehtml")
return Promise.resolve();
return Promise.all([
loadImage("icons/abp-16.png"),
loadImage("icons/abp-16-whitelisted.png"),
......
......@@ -25,6 +25,7 @@ const {Subscription,
require("../adblockpluscore/lib/subscriptionClasses");
const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
const {recommendations} = require("../adblockpluscore/lib/recommendations");
const info = require("info");
const {Prefs} = require("./prefs");
const {synchronizer} = require("../adblockpluscore/lib/synchronizer");
......@@ -219,8 +220,7 @@ function getSubscriptions()
let addDefaultSubscription = shouldAddDefaultSubscriptions();
if (addDefaultSubscription || !Prefs.subscriptions_addedanticv)
{
let data = require("../adblockpluscore/data/subscriptions.json");
for (let [, value] of chooseFilterSubscriptions(data))
for (let [, value] of chooseFilterSubscriptions(recommendations()))
{
let {url, type, title, homepage} = value;
......@@ -233,7 +233,6 @@ function getSubscriptions()
subscription.disabled = false;
subscription.title = title;
subscription.homepage = homepage;
subscription.type = type;
subscriptions.push(subscription);
if (subscription.type == "circumvention")
......
......@@ -22,6 +22,7 @@
const info = require("info");
const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
const {recommendations} = require("../adblockpluscore/lib/recommendations");
const {isDataCorrupted} = require("./subscriptionInit");
const {Prefs} = require("./prefs");
const {Utils} = require("./utils");
......@@ -41,11 +42,13 @@ const abbreviations = new Map([
*/
function getAdsSubscriptions()
{
let recommendations = require("../adblockpluscore/data/subscriptions.json");
recommendations = recommendations
.filter(({type}) => type == "ads")
.map(({url}) => url);
return new Set(recommendations);
let subscriptions = new Set();
for (let subscription of recommendations())
{
if (subscription.type == "ads")
subscriptions.add(subscription.url);
}
return subscriptions;
}
/**
......
......@@ -68,7 +68,6 @@ issue-reporter.js = adblockplusui/issue-reporter.js
popup.html = adblockplusui/popup.html
popup.js = adblockplusui/popup.js
snippets.js = adblockpluscore/lib/content/snippets.js
subscriptions.json = adblockpluscore/data/subscriptions.json
updates.html = adblockplusui/updates.html
updates.js = adblockplusui/updates.js
data/languages.json = adblockplusui/data/languages.json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment