[Pkg-mozext-commits] [adblock-plus] 69/98: Issue 5055 - Update adblockpluscore dependency to revision d0715e99bd3b and adblockplusui to 8ceaabb9c639

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit d9b3c4531d59131bf3d53504ba70f4019f9c0608
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Mar 29 15:25:18 2017 +0200

    Issue 5055 - Update adblockpluscore dependency to revision d0715e99bd3b and adblockplusui to 8ceaabb9c639
---
 dependencies                   | 4 ++--
 ext/common.js                  | 9 +++++++++
 lib/child/elemHideEmulation.js | 9 ++++-----
 metadata.gecko                 | 2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/dependencies b/dependencies
index 8620f2f..ee4ae43 100644
--- a/dependencies
+++ b/dependencies
@@ -1,5 +1,5 @@
 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
 _self = buildtools/ensure_dependencies.py
 buildtools = buildtools hg:dadad687f607 git:c5d65cb
-adblockpluscore = adblockpluscore hg:b1e70036624f git:44e6d2d
-adblockplusui = adblockplusui hg:4286b54830e5 git:dd8888e
+adblockpluscore = adblockpluscore hg:d0715e99bd3b git:82284b6
+adblockplusui = adblockplusui hg:8ceaabb9c639 git:6222fd2
diff --git a/ext/common.js b/ext/common.js
index 1f0219a..296c00f 100644
--- a/ext/common.js
+++ b/ext/common.js
@@ -50,6 +50,15 @@
   {
     this._port = port;
     this._windowID = windowID;
+    this.addListener((payload, sender, resolve) =>
+    {
+      if (payload.type)
+      {
+        let result = this._port._dispatch(payload.type, payload, sender);
+        if (typeof result != "undefined")
+          resolve(result);
+      }
+    });
   };
   EventTarget.prototype = {
     addListener: function(listener)
diff --git a/lib/child/elemHideEmulation.js b/lib/child/elemHideEmulation.js
index 8eb8632..7c4ee17 100644
--- a/lib/child/elemHideEmulation.js
+++ b/lib/child/elemHideEmulation.js
@@ -85,22 +85,21 @@
               // Invalid URL?
             }
 
-            for (let filter of filters)
+            for (let i = 0; i < filters.length; i++)
             {
               RequestNotifier.addNodeData(subject.document, subject.top, {
                 contentType: "ELEMHIDE",
                 docDomain: docDomain,
                 thirdParty: false,
-                // TODO: Show the actual matching selector here?
-                location: filter.replace(/^.*?##/, ""),
-                filter: filter,
+                location: "##" + selectors[i],
+                filter: filters[i],
                 filterType: "elemhideemulation"
               });
             }
           }
         );
 
-        handler.load(() => handler.apply());
+        handler.apply();
       };
 
       subject.addEventListener("load", onReady);
diff --git a/metadata.gecko b/metadata.gecko
index eeec25d..b0a4f8e 100644
--- a/metadata.gecko
+++ b/metadata.gecko
@@ -64,7 +64,7 @@ chrome/content/elemHideEmulation.js = adblockpluscore/chrome/content/elemHideEmu
 lib/ext_background.js = ext/background.js
 lib/ext_common.js = ext/common.js
 lib/messageResponder.js = adblockplusui/messageResponder.js
-lib/antiadblockInit.js = adblockpluscore/lib/antiadblockInit.js
+lib/antiadblockInit.js = adblockplusui/lib/antiadblockInit.js
 lib/common.js = adblockpluscore/lib/common.js
 lib/coreUtils.js = adblockpluscore/lib/coreUtils.js
 lib/downloader.js = adblockpluscore/lib/downloader.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git