Changed wrapping input label to detect any parent <label> rather than just a direct parent. This is not detecting for a valid phrasing content node (i.e. a div is not a valid child of a label), which is not in the scope of wcag testing. This resolves #209.

ironikart · ironikart · commit 1ff5f64e9ed7 · 2018-02-09T10:39:32.000+11:00
diff --git a/HTMLCS.Util.js b/HTMLCS.Util.js
@@ -814,6 +814,39 @@ _global.HTMLCS.util = function() {
     };
 
 
+    /**
+     * Iterate parent nodes of an element.
+     *
+     * @param {DOMNode}  node Node to search from.
+     * @param {Function} cb    Callback function providing each parent node.
+     *
+     * @return void
+     */
+    self.eachParentNode = function(node, cb) {
+        while (node && node.parentNode) {
+            cb(node);
+            node = node.parentNode;
+        };
+    };
+
+
+    /**
+     * Returns TRUE if the provided node name is not a valid phrasing node.
+     *
+     * @param {String} nodeName The node name to test.
+     *
+     * @return {Boolean}
+     */
+    self.isPhrasingNode = function(nodeName) {
+        var nodeNames = [ 'abbr', 'audio', 'b', 'bdo', 'br', 'button', 'canvas', 'cite', 'code', 'command', 'data',
+            'datalist', 'dfn', 'em', 'embed', 'i', 'iframe', 'img', 'input', 'kbd', 'keygen', 'label', 'mark', 'math',
+            'meter', 'noscript', 'object', 'output', 'progress', 'q', 'ruby', 'samp', 'script', 'select', 'small',
+            'span', 'strong', 'sub', 'sup', 'svg', 'textarea', 'time', 'var', 'video', 'wbr'];
+
+        return nodeNames.indexOf(nodeName.toLowerCase()) !== -1;
+    };
+
+
     self.getChildrenForTable = function(table, childNodeName)
     {
         if (table.nodeName.toLowerCase() !== 'table') {
diff --git a/Standards/WCAG2AAA/Sniffs/Principle1/Guideline1_3/1_3_1.js b/Standards/WCAG2AAA/Sniffs/Principle1/Guideline1_3/1_3_1.js
@@ -238,8 +238,15 @@ _global.HTMLCS_WCAG2AAA_Sniffs_Principle1_Guideline1_3_1_3_1 = {
 		}
 
 		// Find an implicit label.
-		var implicitLabel = element.parentNode;
-		if (implicitLabel && (implicitLabel.nodeName.toLowerCase() === 'label')) {
+		var foundImplicit = false;
+		if (element.parentNode) {
+			HTMLCS.util.eachParentNode(element, function(parent) {
+				if (parent.nodeName.toLowerCase() === 'label') {
+					foundImplicit = true;
+				}
+			});
+		}
+		if (foundImplicit === true) {
 			addToLabelList('implicit');
 		}
 
diff --git a/Tests/WCAG2/4_1_2_wrapping_label.html b/Tests/WCAG2/4_1_2_wrapping_label.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>412_wrapping_label</title>
+<!-- @HTMLCS_Test@
+Name: SC 4.1.2 testing of wrapping labels
+Standard: WCAG2AAA
+Assert: No Warning *.H91.InputRadio.Name on #test1
+Assert: No Error *.H91.InputRadio.Name on #test1
+Assert: Error *.H91.InputRadio.Name on #test2
+-->
+</head>
+<body>
+<form>
+    <div>
+        <label>
+          <span>
+            <input type="radio" name="foo" value="foo" id="test1" />
+          </span>
+          <span>
+            Lorem ipsum
+          </span>
+        </label>
+    </div>
+    <div>
+      <span>
+        <input type="radio" name="foo" value="foo" id="test2" />
+      </span>
+      <span>
+        Lorem ipsum
+      </span>
+    </div>
+</form>
+</body>
+</html>
