Issue 3882 - Make checkbox labels sensitive on the option page

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 69 matching lines @@
       var table = E(this.details[j].id);
       var template = table.querySelector("template");
       for (var i = 0; i < arguments.length; i++) 
       {
         var item = arguments[i];
         var listItem = document.createElement("li");
         listItem.appendChild(document.importNode(template.content, true));
         listItem.setAttribute("data-access", item.url || item.text);
 
         var labelId = "label-" + (++maxLabelId);
-        listItem.querySelector(".display").setAttribute("id", labelId);
+        var label = listItem.querySelector(".display");
+        label.setAttribute("id", labelId);
+
         var control = listItem.querySelector(".control");
         if (control)
         {
-          // We use aria-labelledby to avoid triggering the control when
-          // interacting with the label
           control.setAttribute("aria-labelledby", labelId);

[Thomas Greiner, 2016/03/31 16:54:37]

Since we no longer need to prevent the control from being triggered, we could
get rid of this attribute now and use `<label>` as a wrapper instead (as done
with the tweaks checkboxes). That way there'd be no need for the "for" attribute
either.

[Sebastian Noack, 2016/03/31 17:18:12]

I briefly tried that but it somehow breaks the surrounding layout here. We could
probably fix that with a more elaborate change, but I didn't look into why that
is yet. But more importantly, this change only effect checkboxes, while this
code however is also used for other lists that will still need the
aria-labelledby attribute anyway.

           control.addEventListener("click", this.details[j].onClick, false);
+
+          if (label.localName == "label")
+          {
+            var controlId = "control-" + maxLabelId;
+            control.setAttribute("id", controlId);
+            label.setAttribute("for", controlId);
+          }
         }
 
         this._setEmpty(table, null);
         if (table.hasChildNodes())
         {
           table.insertBefore(listItem, 
               table.childNodes[this.items.indexOf(item)]);
         }
         else
           table.appendChild(listItem);
@@ skipping 1028 matching lines @@
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
         "title"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();