From 18937849c32523420e6393375f65f44b636c95c4 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Thu, 17 Mar 2016 12:16:56 -0400
Subject: [PATCH] code review as per feedback from last commit:
 https://github.com/gorhill/uBlock/commit/99a3d9631047d33dc7a454296ab3dd0a1e91d6f1#commitcomment-16748337

---
 src/js/scriptlets/subscriber.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/js/scriptlets/subscriber.js b/src/js/scriptlets/subscriber.js
index 7632d4f42..9c525de0d 100644
--- a/src/js/scriptlets/subscriber.js
+++ b/src/js/scriptlets/subscriber.js
@@ -50,10 +50,8 @@ if ( typeof vAPI !== 'object' ) {
 
 // Only if at least one subscribe link exists on the page.
 
-if (
-    document.querySelector('a[href^="abp:"],a[href^="https://subscribe.adblockplus.org/?"]') === null &&
-    window.location.href.lastIndexOf('https://github.com/gorhill/uBlock/wiki/Filter-lists-from-around-the-web', 0) !== 0
-) {
+var subscribeLinks = document.querySelectorAll('a[href^="abp:"],a[href^="https://subscribe.adblockplus.org/?"]');
+if ( subscribeLinks.length === 0 ) {
     return;
 }
 
@@ -64,19 +62,17 @@ var onAbpLinkClicked = function(ev) {
         return;
     }
     // This addresses https://github.com/ABPIsrael/EasyListHebrew/issues/89
-    if ( ev.isTrusted === false ) {
+    // Also, as per feedback to original fix:
+    // https://github.com/gorhill/uBlock/commit/99a3d9631047d33dc7a454296ab3dd0a1e91d6f1
+    var target = ev.target;
+    if (
+        ev.isTrusted === false ||
+        target !== ev.currentTarget ||
+        target instanceof HTMLAnchorElement === false
+    ) {
         return;
     }
-    var target = ev.target;
-    var limit = 3;
-    var href = '';
-    do {
-        if ( target instanceof HTMLAnchorElement ) {
-            href = target.href;
-            break;
-        }
-        target = target.parentNode;
-    } while ( target && --limit );
+    var href = target.href || '';
     if ( href === '' ) {
         return;
     }
@@ -146,7 +142,9 @@ var onAbpLinkClicked = function(ev) {
     );
 };
 
-document.addEventListener('click', onAbpLinkClicked, true);
+for ( var i = 0; i < subscribeLinks.length; i++ ) {
+    subscribeLinks[i].addEventListener('click', onAbpLinkClicked);
+}
 
 /******************************************************************************/