Skip to content

Commit 1468596

Browse files
committed
Improving getAccessibleName() slightly by passing scoped 'top' element
1 parent 2e4d394 commit 1468596

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

HTMLCS.Util.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,11 +1332,12 @@ _global.HTMLCS.util = function() {
13321332
/**
13331333
* Get the accessible name.
13341334
*
1335-
* @param {DOMNode} element Element to process.
1335+
* @param {DOMNode} element Element to process.
1336+
* @param {DOMNode} top Scoped container element.
13361337
*
13371338
* @returns {String} The accessible name.
13381339
*/
1339-
self.getAccessibleName = function(element) {
1340+
self.getAccessibleName = function(element, top) {
13401341
// See https://www.w3.org/TR/accname-1.1/#terminology
13411342
if (self.isVisuallyHidden(element)) {
13421343
return '';
@@ -1346,7 +1347,7 @@ _global.HTMLCS.util = function() {
13461347
var parts = element.getAttribute("aria-labelledby").split(" ");
13471348
for (var i = 0; i < parts.length; i++) {
13481349
var x = parts[i];
1349-
var nameElement = document.getElementById(x);
1350+
var nameElement = top.getElementById(x);
13501351
if (nameElement) {
13511352
nameParts.push(nameElement.textContent);
13521353
}

Standards/WCAG2AAA/Sniffs/Principle2/Guideline2_5/2_5_3.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ _global.HTMLCS_WCAG2AAA_Sniffs_Principle2_Guideline2_5_2_5_3 = {
4646
switch (nodeName) {
4747
case "a":
4848
visibleLabel = HTMLCS.util.getTextContent(element);
49-
accessibleName = HTMLCS.util.getAccessibleName(element);
49+
accessibleName = HTMLCS.util.getAccessibleName(element, top);
5050
break;
5151
case "button":
5252
visibleLabel = HTMLCS.util.getTextContent(element);
53-
accessibleName = HTMLCS.util.getAccessibleName(element);
53+
accessibleName = HTMLCS.util.getAccessibleName(element, top);
5454
break;
5555
case "label":
5656
visibleLabel = HTMLCS.util.getTextContent(element);
@@ -61,14 +61,14 @@ _global.HTMLCS_WCAG2AAA_Sniffs_Principle2_Guideline2_5_2_5_3 = {
6161
} else {
6262
var refNode = top.getElementById(labelFor);
6363
}
64-
accessibleName = HTMLCS.util.getAccessibleName(refNode);
64+
accessibleName = HTMLCS.util.getAccessibleName(refNode, top);
6565
}
6666
break;
6767
case "input":
6868
if (element.getAttribute("type") === "submit") {
6969
visibleLabel = element.getAttribute("value");
7070
}
71-
accessibleName = HTMLCS.util.getAccessibleName(element);
71+
accessibleName = HTMLCS.util.getAccessibleName(element, top);
7272
break;
7373
}
7474
if (!!visibleLabel && !!accessibleName) {

0 commit comments

Comments
 (0)