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)
   {
+    let link = null;
+    if (linkTarget)
+    {
+      try
+      {
+        link = new URL(linkTarget);
+      }
+      catch(ex)
+      {
+        // Don't handle links with invalid URLs
+        return;
+      }
+    }
+
     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))
+      link = event.target;
+      while (!(link instanceof Ci.nsIDOMHTMLAnchorElement))
+      {
         link = link.parentNode;
 
-      if (!link || link.protocol != "abp:")
-        return;
+        if (!link)
+          return;
+      }
+    }
 
+    let queryString = null;
+    if (link.protocol == "http:" || link.protocol == "https:")
+    {
+      if (link.host == "subscribe.adblockplus.org" || link.pathname == "/")
+        queryString = link.search.substr(1);
+    }
+    else if (link.protocol == "abp:")

[Sebastian Noack, 2015/04/01 14:41:58]

Note that in the Chrome implementation - for simplicity - we omit that check,
running the regexp on all non-HTTP(S) URLs. This removes duplication, and
non-HTTP(s) URLs are a case not frequent enough to be worth optimizing, IMO.

[Thomas Greiner, 2015/04/01 15:03:36]

Done.

+    {
+      // Firefox doesn't populate the "search" property for links with
+      // non-standard URL schemes so we need to extract the query string
+      // manually
+      let match = /^abp:\/*subscribe\/*\?(.*)/i.exec(link.href);
+      if (match)
+        queryString = match[1];
+    }
+
+    if (!queryString)
+      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 queryString.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);
 });