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

Unified Diff: lib/subscriptionInit.js

Issue 29877564: Issue 6933 - Update adblockpluscore dependency to hg:dcda4859fcbd (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Rebase on next and update adblockplusui dependency Created Sept. 11, 2018, 1:40 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: lib/subscriptionInit.js
===================================================================
--- a/lib/subscriptionInit.js
+++ b/lib/subscriptionInit.js
@@ -19,17 +19,17 @@
"use strict";
const {Subscription,
DownloadableSubscription,
SpecialSubscription} =
require("../adblockpluscore/lib/subscriptionClasses");
const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
-const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
const info = require("info");
const {Prefs} = require("./prefs");
const {Synchronizer} = require("../adblockpluscore/lib/synchronizer");
const {Utils} = require("./utils");
const {initNotifications} = require("./notificationHelper");
const {updatesVersion} = require("../adblockplusui/lib/prefs");
let firstRun;
@@ -296,17 +296,17 @@
url = "updates.html";
browser.tabs.create({url});
}
});
}
}
Promise.all([
- FilterNotifier.once("load"),
+ filterNotifier.once("load"),
Prefs.untilLoaded.catch(() => { dataCorrupted = true; })
]).then(detectFirstRun)
.then(getSubscriptions)
.then(addSubscriptionsAndNotifyUser)
// We have to require the "uninstall" module on demand,
// as the "uninstall" module in turn requires this module.
.then(() => { require("./uninstall").setUninstallURL(); })
.then(initNotifications);
« lib/requestBlocker.js ('K') | « lib/stats.js ('k') | lib/whitelisting.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld