[Pkg-mozext-commits] [adblock-plus] 15/98: Issue 4162 - Rename about:abp-elemhidehit into about:abp-elemhide

[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 e158fd18ef43515de80b931039f8b64eda584ec9
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Jun 17 01:19:36 2016 +0100

    Issue 4162 - Rename about:abp-elemhidehit into about:abp-elemhide
---
 lib/child/elemHide.js     | 12 ++++++------
 lib/elemHideStylesheet.js |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/child/elemHide.js b/lib/child/elemHide.js
index b29181c..d7c941e 100644
--- a/lib/child/elemHide.js
+++ b/lib/child/elemHide.js
@@ -54,7 +54,7 @@ let AboutHandler =
 {
   classID: Components.ID("{55fb7be0-1dd2-11b2-98e6-9e97caf8ba67}"),
   classDescription: "Element hiding hit registration protocol handler",
-  aboutPrefix: "abp-elemhidehit",
+  aboutPrefix: "abp-elemhide",
 
   /**
    * Registers handler on startup.
@@ -93,14 +93,14 @@ let AboutHandler =
 
   newChannel: function(uri, loadInfo)
   {
-    let match = /\?(\d+|css)$/.exec(uri.path);
+    let match = /\?(?:hit(\d+)|css)$/.exec(uri.path);
     if (!match)
       throw Cr.NS_ERROR_FAILURE;
 
-    if (match[1] == "css")
-      return new StyleDataChannel(uri, loadInfo);
-    else
+    if (match[1])
       return new HitRegistrationChannel(uri, loadInfo, match[1]);
+    else
+      return new StyleDataChannel(uri, loadInfo);
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory, Ci.nsIAboutModule])
@@ -231,7 +231,7 @@ StyleDataChannel.prototype = {
     // insists on opening channels synchronously.
     let domains = port.emitSync("getSelectors");
 
-    let cssPrefix = "{-moz-binding: url(about:abp-elemhidehit?";
+    let cssPrefix = "{-moz-binding: url(about:abp-elemhide?hit";
     let cssSuffix = "#dummy) !important;}\n";
     let result = [];
 
diff --git a/lib/elemHideStylesheet.js b/lib/elemHideStylesheet.js
index 26ba639..07b39a2 100644
--- a/lib/elemHideStylesheet.js
+++ b/lib/elemHideStylesheet.js
@@ -33,7 +33,7 @@ let applied = false;
  * Stylesheet URL to be registered
  * @type nsIURI
  */
-let styleURL = Utils.makeURI("about:abp-elemhidehit?css");
+let styleURL = Utils.makeURI("about:abp-elemhide?css");
 
 function init()
 {

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