From 1cf724c57a8df045c3e30504a37ba488277ca054 Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Thu, 30 Jun 2016 07:56:12 +0200
Subject: [PATCH] Simplify detection of markable `<label>`s

Apparently, such elements have a `.control` property that returns their
associated form control. No need to manually look for the 'for'
attribute or nested form control elements.
---
 extension/lib/commands-frame.coffee | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/extension/lib/commands-frame.coffee b/extension/lib/commands-frame.coffee
index 94fa25d..af3ab61 100644
--- a/extension/lib/commands-frame.coffee
+++ b/extension/lib/commands-frame.coffee
@@ -258,14 +258,9 @@ commands.follow = helper_follow.bind(
       # but keeps the `<label>` to click, either for styling purposes or to keep
       # the `<input>` hidden until it is used. In those cases we should add a
       # marker for the `<label>`.
-      when element.localName == 'label'
-        input =
-          if element.htmlFor
-            document.getElementById?(element.htmlFor)
-          else
-            element.querySelector?('input, textarea, select')
-        if input and not getElementShape(input).nonCoveredPoint
-          type = 'clickable'
+      when element.localName == 'label' and element.control and
+           not getElementShape(element.control).nonCoveredPoint
+        type = 'clickable'
       # Last resort checks for elements that might be clickable because of
       # JavaScript.
       when (not isXUL and
-- 
2.39.3