Merge branch 'core-update' into 'master'

Issue 6860 - Update adblockpluscore to git:2551978

See merge request eyeo/adblockplus/libadblockplus!15

Author: hfiguiere

dependencies

@@ -1,6 +1,6 @@
 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
 _self = buildtools/ensure_dependencies.py
 buildtools = buildtools hg:6ab9eb46db2a git:2f2bf1f217314022327d4bd9c39002e9248dcf7f
-adblockpluscore = adblockpluscore hg:5f5cea471d7e git:059151706b3d88c78f85ad3ebf2dddbc598a47fa
+adblockpluscore = adblockpluscore hg:a735ad4e34e5 git:2551978
 third_party/googletest = googletest-github hg:368e1f54e5f6 git:d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0
 third_party/gyp = gyp hg:5382e1309be1 git:85707cef17503c05c0105fb0430fd8ada907d719

include/AdblockPlus/FilterEngine.h

@@ -240,7 +240,7 @@ namespace AdblockPlus
     /**
      * Callback type invoked when the filters change.
      * The first parameter is the action event code (see
-     * [FilterNotifier.triggerListeners](https://adblockplus.org/jsdoc/adblockpluscore/FilterNotifier.html#.triggerListeners)
+     * [filterNotifier.on](https://adblockplus.org/jsdoc/adblockpluscore/EventEmitter.html#on)
      * for the full list).
      * The second parameter is the filter/subscription object affected, if any.
      */

lib/api.js

@@ -42,10 +42,8 @@ let API = (() =>
 
     isListedFilter(filter)
     {
-      return filter.subscriptions.some(s =>
-      {
-        return (s instanceof SpecialSubscription && !s.disabled);
-      });
+      return [...filter.subscriptions()]
+        .some(s => (s instanceof SpecialSubscription && !s.disabled));
     },
 
     addFilterToList(filter)
@@ -87,7 +85,7 @@ let API = (() =>
 
     isListedSubscription(subscription)
     {
-      return subscription.url in FilterStorage.knownSubscriptions;
+      return FilterStorage.knownSubscriptions.has(subscription.url);
     },
 
     addSubscriptionToList(subscription)

lib/compat.js

@@ -25,6 +25,10 @@ let window = this;
 
 function require(module)
 {
+  // Following Issue 5762 we use relative path for require
+  // https://issues.adblockplus.org/ticket/5762
+  if (module.startsWith("./"))
+    module = module.substring(2);
   return require.scopes[module];
 }
 require.scopes = {__proto__: null};

lib/filterUpdateRegistration.js

@@ -17,9 +17,38 @@
 
 "use strict";
 
-let {FilterNotifier} = require("filterNotifier");
+const {filterNotifier} = require("filterNotifier");
 
-FilterNotifier.addListener((action, item) =>
+// Until we change libadblockplus API we need to listen to all the
+// notification.
+let callback = (action, item) =>
 {
   _triggerEvent("filterChange", action, item);
-});
+};
+
+let events = [
+  "elemhideupdate",
+  "load",
+  "save",
+  "filter.added",
+  "filter.disabled",
+  "filter.hitCount",
+  "filter.lastHit",
+  "filter.moved",
+  "filter.removed",
+  "subscription.added",
+  "subscription.disabled",
+  "subscription.downloading",
+  "subscription.downloadStatus",
+  "subscription.errors",
+  "subscription.fixedTitle",
+  "subscription.homepage",
+  "subscription.lastCheck",
+  "subscription.lastDownload",
+  "subscription.moved",
+  "subscription.removed",
+  "subscription.title",
+  "subscription.updated",
+];
+
+events.forEach(element => filterNotifier.on(element, callback.bind(this, element)));

lib/init.js

@@ -17,8 +17,8 @@
 
 "use strict";
 
-let {Prefs} = require("prefs");
-let {FilterNotifier} = require("filterNotifier");
+const {Prefs} = require("prefs");
+const {filterNotifier} = require("filterNotifier");
 
 let filtersInitDone = false;
 
@@ -39,48 +39,45 @@ Prefs._initListener = function()
 if (Prefs.initialized)
   checkInitialized();
 
-FilterNotifier.addListener(action =>
+filterNotifier.on("load", () =>
 {
-  if (action === "load")
+  let {FilterStorage} = require("filterStorage");
+  if (FilterStorage.firstRun)
   {
-    let {FilterStorage} = require("filterStorage");
-    if (FilterStorage.firstRun)
-    {
-      // No data, must be a new user or someone with corrupted data - initialize
-      // with default settings
+    // No data, must be a new user or someone with corrupted data - initialize
+    // with default settings
 
-      const {Subscription, DownloadableSubscription} =
-        require("subscriptionClasses");
-      const {Synchronizer} = require("synchronizer");
-      const {Utils} = require("utils");
+    const {Subscription, DownloadableSubscription} =
+      require("subscriptionClasses");
+    const {Synchronizer} = require("synchronizer");
+    const {Utils} = require("utils");
 
-      if (Prefs.first_run_subscription_auto_select)
+    if (Prefs.first_run_subscription_auto_select)
+    {
+      let subscriptions = require("subscriptions.xml");
+      let node = Utils.chooseFilterSubscription(subscriptions);
+      if (node)
       {
-        let subscriptions = require("subscriptions.xml");
-        let node = Utils.chooseFilterSubscription(subscriptions);
-        if (node)
-        {
-          let subscription = Subscription.fromURL(node.url);
-          subscription.disabled = false;
-          subscription.title = node.title;
-          subscription.homepage = node.homepage;
-          FilterStorage.addSubscription(subscription);
-          if (subscription instanceof DownloadableSubscription &&
-              !subscription.lastDownload)
-            Synchronizer.execute(subscription);
-        }
-
-        let aaSubscription =
-            Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
-        aaSubscription.disabled = false;
-        FilterStorage.addSubscription(aaSubscription);
-        if (aaSubscription instanceof DownloadableSubscription &&
-            !aaSubscription.lastDownload)
-          Synchronizer.execute(aaSubscription);
+        let subscription = Subscription.fromURL(node.url);
+        subscription.disabled = false;
+        subscription.title = node.title;
+        subscription.homepage = node.homepage;
+        FilterStorage.addSubscription(subscription);
+        if (subscription instanceof DownloadableSubscription &&
+            !subscription.lastDownload)
+          Synchronizer.execute(subscription);
       }
-    }
 
-    filtersInitDone = true;
-    checkInitialized();
+      let aaSubscription =
+          Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
+      aaSubscription.disabled = false;
+      FilterStorage.addSubscription(aaSubscription);
+      if (aaSubscription instanceof DownloadableSubscription &&
+          !aaSubscription.lastDownload)
+        Synchronizer.execute(aaSubscription);
+    }
   }
+
+  filtersInitDone = true;
+  checkInitialized();
 });

libadblockplus.gyp

@@ -141,10 +141,13 @@
           'adblockpluscore/lib/common.js',
           'adblockpluscore/lib/filterClasses.js',
           'adblockpluscore/lib/subscriptionClasses.js',
+          'adblockpluscore/lib/iniParser.js',
           'adblockpluscore/lib/filterStorage.js',
+          'adblockpluscore/lib/elemHideExceptions.js',
           'adblockpluscore/lib/elemHide.js',
           'adblockpluscore/lib/elemHideEmulation.js',
           'adblockpluscore/lib/matcher.js',
+          'adblockpluscore/lib/snippets.js',
           'adblockpluscore/lib/filterListener.js',
           'adblockpluscore/lib/downloader.js',
           'adblockpluscore/lib/notification.js',