Commit 138bc568 authored by Winsley's avatar Winsley

Fixed #55 - Update adblockplusui dependency to cb2f5cd and adblockpluscore dependency to d3f6b1b

parent 856618ba
Pipeline #79908469 failed with stages
in 23 minutes and 44 seconds
......@@ -44,7 +44,12 @@ stages:
xvfb libnss3 libxss1 libgconf-2-4 libasound2 nodejs npm;
fi
- mkdir -p .git/info
- pip install --user Jinja2 cryptography
- pip install --user Jinja2 cryptography fonttools brotli
# This pipeline runs on a custom runner as an unpriviliged user.
# Therefore the pyftsubset executable of the fonttools dependency above is
# installed to `~/.local/bin` and needs to be added to the $PATH variable
# in order to be available.
- export PATH=$PATH:~/.local/bin
- "npm_config_unsafe_perm=true python ensure_dependencies.py"
- "[ -d node_modules ] || npm install"
......
......@@ -22,6 +22,8 @@ Building
- [Python 2.7](https://www.python.org)
- [The Jinja2 module](http://jinja.pocoo.org/docs) (>= 2.8)
- For signed builds: [PyCrypto module](https://www.dlitz.net/software/pycrypto/)
- For font generation using pyftsubset: [fonttools](https://github.com/fonttools/fonttools)
- Enabling fonttools to generate WOFF 2.0 fonts: [brotli](https://github.com/google/brotli)
- [Node.js](https://nodejs.org/) (>= 8.9)
### Building on Windows
......
_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:cdf04dd1024d git:b4651bb
adblockplusui = adblockplusui hg:bd03c7fd123e git:437d5cf
adblockpluscore = adblockpluscore hg:43c5f74ef7ca git:d3f6b1b
adblockplusui = adblockplusui hg:42f63b4d9186 git:cb2f5cd
......@@ -101,7 +101,7 @@ function getBackupData()
});
}
filterNotifier.on("load", scheduleBackup);
filterNotifier.on("ready", scheduleBackup);
filterNotifier.on("subscription.updated", scheduleBackup);
filterNotifier.on("subscription.added", scheduleBackup);
filterNotifier.on("subscription.removed", scheduleBackup);
......
This diff is collapsed.
......@@ -27,6 +27,7 @@ const {Notification: NotificationStorage} =
require("../adblockpluscore/lib/notification");
const {initAntiAdblockNotification} =
require("../adblockplusui/lib/antiadblockInit");
const {initDay1Notification} = require("../adblockplusui/lib/day1Init");
const {showOptions} = require("./options");
const displayMethods = new Map([
......@@ -337,8 +338,10 @@ function showNotification(notification)
/**
* Initializes the notification system.
*
* @param {bool} firstRun
*/
exports.initNotifications = () =>
exports.initNotifications = firstRun =>
{
if (typeof Prefs.notificationdata.firstVersion == "undefined")
Prefs.notificationdata.firstVersion = "0";
......@@ -379,6 +382,9 @@ exports.initNotifications = () =>
}
initAntiAdblockNotification();
if (firstRun)
initDay1Notification();
};
/**
......@@ -431,4 +437,9 @@ ext.pages.onLoading.addListener(page =>
NotificationStorage.showNext(page.url.href);
});
Prefs.on("blocked_total", () =>
{
NotificationStorage.showNext();
});
NotificationStorage.addShowListener(showNotification);
......@@ -146,12 +146,6 @@ defaults.show_statsinpopup = true;
*/
defaults.shouldShowBlockElementMenu = true;
/**
* Only for compatibility with core code. Please do not change!
* @type {boolean}
*/
defaults.notifications_showui = false;
/**
* Whether to show tracking warning in options page when both
* Acceptable Ads and subscription of type "Privacy" are enabled.
......@@ -183,8 +177,8 @@ defaults.notifications_ignoredcategories = [];
defaults.show_devtools_panel = true;
/**
* Whether to suppress the first run and updates page. This preference isn't
* set by the extension but can be pre-configured externally.
* Prevents unsolicited UI elements from showing up after installation. This
* preference isn't set by the extension but can be pre-configured externally.
*
* @see https://adblockplus.org/development-builds/suppressing-the-first-run-page-on-chrome
* @type {boolean}
......
......@@ -316,4 +316,4 @@ filterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
filterNotifier.on("filter.added", onFilterChange);
filterNotifier.on("filter.removed", onFilterChange);
filterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
filterNotifier.on("load", onFilterChange);
filterNotifier.on("ready", onFilterChange);
......@@ -287,7 +287,7 @@ function addSubscriptionsAndNotifyUser(subscriptions)
}
Promise.all([
filterNotifier.once("load"),
filterNotifier.once("ready"),
Prefs.untilLoaded.catch(() => { dataCorrupted = true; })
]).then(detectFirstRun)
.then(getSubscriptions)
......@@ -295,7 +295,7 @@ Promise.all([
// We have to require the "uninstall" module on demand,
// as the "uninstall" module in turn requires this module.
.then(() => { require("./uninstall").setUninstallURL(); })
.then(initNotifications);
.then(() => initNotifications(firstRun));
/**
* Gets a value indicating whether the default filter subscriptions have been
......
......@@ -37,6 +37,9 @@ permissions =
storage
unlimitedStorage
notifications
optional_permissions =
contentSettings
management
[compat]
chrome = 51.0
......@@ -54,6 +57,8 @@ document_end = include.postload.js
common.js = adblockplusui/common.js
composer.html = adblockplusui/composer.html
composer.js = adblockplusui/composer.js
day1.html = adblockplusui/day1.html
day1.js = adblockplusui/day1.js
desktop-options.html = adblockplusui/desktop-options.html
desktop-options.js = adblockplusui/desktop-options.js
devtools-panel.html = adblockplusui/devtools-panel.html
......@@ -65,6 +70,9 @@ issue-reporter.html = adblockplusui/issue-reporter.html
issue-reporter.js = adblockplusui/issue-reporter.js
popup.html = adblockplusui/popup.html
popup.js = adblockplusui/popup.js
popup-dummy.html = adblockplusui/popup-dummy.html
popup-dummy.js = adblockplusui/popup-dummy.js
proxy.html = adblockplusui/proxy.html
snippets.js = adblockpluscore/lib/content/snippets.js
updates.html = adblockplusui/updates.html
updates.js = adblockplusui/updates.js
......@@ -72,37 +80,30 @@ data/languages.json = adblockplusui/data/languages.json
icons/detailed/abp-128.png = adblockplusui/skin/icons/abp-128.png
skin/common.css = adblockplusui/skin/common.css
skin/composer.css = adblockplusui/skin/composer.css
skin/day1.css = adblockplusui/skin/day1.css
skin/desktop-options.css = adblockplusui/skin/desktop-options.css
skin/devtools-panel.css = adblockplusui/skin/devtools-panel.css
skin/first-run.css = adblockplusui/skin/first-run.css
skin/fonts.css = adblockplusui/skin/fonts.css
skin/fonts.css = adblockplusui/skin/fonts/font.css
skin/issue-reporter.css = adblockplusui/skin/issue-reporter.css
skin/popup.css = adblockplusui/skin/popup.css
skin/popup-dummy.css = adblockplusui/skin/popup-dummy.css
skin/updates.css = adblockplusui/skin/updates.css
skin/web.css = adblockplusui/skin/web.css
skin/backgrounds/appstore.svg = adblockplusui/skin/backgrounds/appstore.svg
skin/backgrounds/googleplay.svg = adblockplusui/skin/backgrounds/googleplay.svg
skin/fonts/Source-Sans-Pro/300/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/cyrillic-ext.woff2
skin/fonts/Source-Sans-Pro/300/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/cyrillic.woff2
skin/fonts/Source-Sans-Pro/300/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/greek-ext.woff2
skin/fonts/Source-Sans-Pro/300/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/greek.woff2
skin/fonts/Source-Sans-Pro/300/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/latin-ext.woff2
skin/fonts/Source-Sans-Pro/300/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/latin.woff2
skin/fonts/Source-Sans-Pro/300/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/vietnamese.woff2
skin/fonts/Source-Sans-Pro/400/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/cyrillic-ext.woff2
skin/fonts/Source-Sans-Pro/400/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/cyrillic.woff2
skin/fonts/Source-Sans-Pro/400/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/greek-ext.woff2
skin/fonts/Source-Sans-Pro/400/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/greek.woff2
skin/fonts/Source-Sans-Pro/400/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/latin-ext.woff2
skin/fonts/Source-Sans-Pro/400/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/latin.woff2
skin/fonts/Source-Sans-Pro/400/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/vietnamese.woff2
skin/fonts/Source-Sans-Pro/700/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/cyrillic-ext.woff2
skin/fonts/Source-Sans-Pro/700/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/cyrillic.woff2
skin/fonts/Source-Sans-Pro/700/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/greek-ext.woff2
skin/fonts/Source-Sans-Pro/700/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/greek.woff2
skin/fonts/Source-Sans-Pro/700/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/latin-ext.woff2
skin/fonts/Source-Sans-Pro/700/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/latin.woff2
skin/fonts/Source-Sans-Pro/700/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/vietnamese.woff2
skin/backgrounds/toolbar.svg = adblockplusui/skin/backgrounds/toolbar.svg
skin/fonts/300/Athiti.woff2 = adblockplusui/skin/fonts/300/Athiti.woff2
skin/fonts/300/Cairo.woff2 = adblockplusui/skin/fonts/300/Cairo.woff2
skin/fonts/300/SourceSansPro.woff2 = adblockplusui/skin/fonts/300/SourceSansPro.woff2
skin/fonts/400/Athiti.woff2 = adblockplusui/skin/fonts/400/Athiti.woff2
skin/fonts/400/Cairo.woff2 = adblockplusui/skin/fonts/400/Cairo.woff2
skin/fonts/400/SourceSansPro.woff2 = adblockplusui/skin/fonts/400/SourceSansPro.woff2
skin/fonts/700/Athiti.woff2 = adblockplusui/skin/fonts/700/Athiti.woff2
skin/fonts/700/Cairo.woff2 = adblockplusui/skin/fonts/700/Cairo.woff2
skin/fonts/700/SourceSansPro.woff2 = adblockplusui/skin/fonts/700/SourceSansPro.woff2
skin/fonts/font.css = adblockplusui/skin/fonts/font.css
skin/icons/abp-full-logo.svg = adblockplusui/skin/icons/abp-full-logo.svg
skin/icons/abp-logo.svg = adblockplusui/skin/icons/abp-logo.svg
skin/icons/alert.svg = adblockplusui/skin/icons/alert.svg
skin/icons/android.svg = adblockplusui/skin/icons/android.svg
......@@ -119,6 +120,7 @@ skin/icons/error.svg = adblockplusui/skin/icons/error.svg
skin/icons/facebook.svg = adblockplusui/skin/icons/facebook.svg
skin/icons/gear.svg = adblockplusui/skin/icons/gear.svg
skin/icons/globe.svg = adblockplusui/skin/icons/globe.svg
skin/icons/heart.svg = adblockplusui/skin/icons/heart.svg
skin/icons/hide.svg = adblockplusui/skin/icons/hide.svg
skin/icons/highlight.svg = adblockplusui/skin/icons/highlight.svg
skin/icons/iconOff.svg = adblockplusui/skin/icons/iconOff.svg
......@@ -127,11 +129,15 @@ skin/icons/info.svg = adblockplusui/skin/icons/info.svg
skin/icons/radio.svg = adblockplusui/skin/icons/radio.svg
skin/icons/reload.svg = adblockplusui/skin/icons/reload.svg
skin/icons/report-issue.svg = adblockplusui/skin/icons/report-issue.svg
skin/icons/star.svg = adblockplusui/skin/icons/star.svg
skin/icons/toggle.svg = adblockplusui/skin/icons/toggle.svg
skin/icons/tooltip.svg = adblockplusui/skin/icons/tooltip.svg
skin/icons/trash.svg = adblockplusui/skin/icons/trash.svg
skin/icons/twitter.svg = adblockplusui/skin/icons/twitter.svg
skin/icons/weibo.svg = adblockplusui/skin/icons/weibo.svg
skin/icons/day1/bug.svg = adblockplusui/skin/icons/day1/bug.svg
skin/icons/day1/tower.svg = adblockplusui/skin/icons/day1/tower.svg
skin/icons/day1/wave.svg = adblockplusui/skin/icons/day1/wave.svg
skin/icons/first-run/checkmark-header.svg = adblockplusui/skin/icons/first-run/checkmark-header.svg
skin/icons/first-run/checkmark.svg = adblockplusui/skin/icons/first-run/checkmark.svg
skin/icons/first-run/lock.svg = adblockplusui/skin/icons/first-run/lock.svg
......@@ -140,6 +146,7 @@ skin/icons/updates/base-graphic.svg = adblockplusui/skin/icons/updates/base-grap
skin/icons/updates/mobile.svg = adblockplusui/skin/icons/updates/mobile.svg
skin/icons/updates/rocket.svg = adblockplusui/skin/icons/updates/rocket.svg
skin/icons/updates/thumbs-up.svg = adblockplusui/skin/icons/updates/thumbs-up.svg
skin/icons/waving.svg = adblockplusui/skin/icons/waving.svg
skin/icons/web/navbar-logo.svg = adblockplusui/skin/icons/web/navbar-logo.svg
[bundles]
......@@ -155,7 +162,7 @@ lib/adblockplus.js =
lib/uninstall.js
lib/csp.js
lib/contentFiltering.js
adblockplusui/lib/messageResponder.js
lib/messageResponder.js
include.preload.js =
include.preload.js
inject.preload.js
......@@ -167,6 +174,7 @@ include.postload.js =
adblockplusui/locale/*/antiadblockInit.json = *
adblockplusui/locale/*/common.json = *
adblockplusui/locale/*/composer.json = *
adblockplusui/locale/*/day1.json = *
adblockplusui/locale/*/desktop-options.json = *
adblockplusui/locale/*/devtools-panel.json = *
adblockplusui/locale/*/filter-validation.json = *
......
......@@ -21,10 +21,16 @@
let asyncAPIs = [
"browserAction.setIcon",
"browserAction.getPopup",
"contentSettings.cookies.get",
"contentSettings.javascript.get",
"contextMenus.removeAll",
"devtools.panels.create",
"management.getAll",
"notifications.clear",
"notifications.create",
"permissions.contains",
"permissions.remove",
"permissions.request",
"runtime.getBrowserInfo",
"runtime.openOptionsPage",
"runtime.sendMessage",
......
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