Issue 2211 - Implemented subscribe.adblockplus.org subscription links

lib/ui.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 877 matching lines @@
         }
       }, false);
       request.send();
     }
     else
       notifyUser();
   },
 
   /**
    * Handles clicks inside the browser's content area, will intercept clicks on
-   * abp: links. This can be called either with an event object or with the link
-   * target (if it is the former then link target will be retrieved from event
-   * target).
+   * abp: links as well as links to subscribe.adblockplus.org. This can be called
+   * either with an event object or with the link target (if it is the former then
+   * link target will be retrieved from event target).
    */
   onBrowserClick: function (/**Window*/ window, /**Event*/ event, /**String*/ linkTarget)
   {
     if (event)
     {
       // Ignore right-clicks
       if (event.button == 2)
         return;
 
       // Search the link associated with the click
       let link = event.target;
-      while (link && !(link instanceof Ci.nsIDOMHTMLAnchorElement))
+      while (!(link instanceof Ci.nsIDOMHTMLAnchorElement))
+      {
         link = link.parentNode;
 
-      if (!link || link.protocol != "abp:")
-        return;
+        if (!link)
+          return;
+      }
+      linkTarget = link.href;
+    }
 
+    let match = /^(?:abp:\/*subscribe|https?:\/*subscribe\.adblockplus\.org)\/*\?(.*)/i.exec(linkTarget);

[Sebastian Noack, 2015/04/01 12:29:49]

I think we should use DOM API's (i.e. the anchor element's "protocol", "host",
"pathname" and "search" property) to parse HTTP/HTTPS URLs like we do on Chrome.
This will be more efficient and IMO cleaner than using a regexp, if consistency
with the implementation for Chrome isn't reason enough.

[Thomas Greiner, 2015/04/01 12:41:15]

It's a different situation than on Chrome since we also have to consider the
optional "linkTarget" parameter but I guess by creating a new instance of URL it
could be made more similar to the Chrome implementation. I'll work on that.

[Sebastian Noack, 2015/04/01 12:44:20]

I'm not sure what you mean. Since you already use link.href above, and the old
code also used link.protocol, I suppose you could also use link.host,
link.pathname and link.search?

[Thomas Greiner, 2015/04/01 12:51:30]

There are two ways to get a link target here. One is through an event (as we do
in Chrome) and the other way is through the "linkTarget" parameter of the
"onBrowserClick" function. If we only check for "subscribe.adblockplus.org" in
the above if-statement we'd ignore cases where "subscribe.adblockplus.org" is
passed through the "linkTarget" parameter.

+    if (!match)
+      return;
+
+    if (event)
+    {
       // This is our link - make sure the browser doesn't handle it
       event.preventDefault();
       event.stopPropagation();
-
-      linkTarget = link.href;
     }
 
-    let match = /^abp:\/*subscribe\/*\?(.*)/i.exec(linkTarget);
-    if (!match)
-      return;
-
     // Decode URL parameters
     let title = null;
     let url = null;
     let mainSubscriptionTitle = null;
     let mainSubscriptionURL = null;
-    for (let param of match[1].split('&'))
+    for (let param of match[1].split("&"))
     {
       let parts = param.split("=", 2);
       if (parts.length != 2 || !/\S/.test(parts[1]))
         continue;
       switch (parts[0])
       {
         case "title":
           title = decodeURIComponent(parts[1]);
           break;
         case "location":
@@ skipping 1018 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });