chore: small refactor of escapeSelector calls

dequelabs · Jun 28, 2017 · 428eea2 · 428eea2
1 parent 0b2d6be
commit 428eea2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 38 deletions.
diff --git a/lib/checks/aria/required-parent.js b/lib/checks/aria/required-parent.js
@@ -35,11 +35,8 @@ function getAriaOwners(element) {
 
 	while (element) {
 		if (element.getAttribute('id')) {
-			o = document.querySelector(
-				'[aria-owns~=' + 
-				axe.commons.utils.escapeSelector(element.getAttribute('id')) +
-				']'
-			);
+			const id = axe.commons.utils.escapeSelector(element.getAttribute('id'));
+			o = document.querySelector(`[aria-owns~=${id}]`);
 			if (o) { owners.push(o); }
 		}
 		element = element.parentElement;

diff --git a/lib/checks/label/explicit.js b/lib/checks/label/explicit.js
@@ -1,9 +1,7 @@
 if (node.getAttribute('id')) {
-	var label = document.querySelector(
-    'label[for="' + 
-    axe.commons.utils.escapeSelector(node.getAttribute('id')) +
-    '"]'
-  );
+  const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+	const label = document.querySelector(`label[for="${id}"]`);
+
 	if (label) {
 		return !!axe.commons.text.accessibleText(label);
 	}

diff --git a/lib/checks/label/multiple-label.js b/lib/checks/label/multiple-label.js
@@ -1,6 +1,6 @@
-var labels = [].slice.call(document.querySelectorAll('label[for="' +
-	axe.commons.utils.escapeSelector(node.getAttribute('id')) + '"]')),
-	parent = node.parentNode;
+const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+let labels = Array.from(document.querySelectorAll(`label[for="${id}"]`));
+let parent = node.parentNode;
 
 if (labels.length) {
 	// filter out hidden labels because they're fine

diff --git a/lib/checks/shared/duplicate-id.js b/lib/checks/shared/duplicate-id.js
@@ -4,12 +4,10 @@ if (!node.getAttribute('id').trim()) {
 	return true;
 }
 
-var matchingNodes = document.querySelectorAll(
-  '[id="' + 
-  axe.commons.utils.escapeSelector(node.getAttribute('id')) + 
-  '"]'
-);
+const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+var matchingNodes = document.querySelectorAll(`[id="${id}"]`);
 var related = [];
+
 for (var i = 0; i < matchingNodes.length; i++) {
 	if (matchingNodes[i] !== node) {
 		related.push(matchingNodes[i]);

diff --git a/lib/commons/table/is-header.js b/lib/commons/table/is-header.js
@@ -11,11 +11,8 @@ table.isHeader = function (cell) {
 	}
 
 	if (cell.getAttribute('id')) {
-		return !!document.querySelector(
-      '[headers~="' +
-      axe.utils.escapeSelector(cell.getAttribute('id')) +
-      '"]'
-    );
+    const id = axe.utils.escapeSelector(cell.getAttribute('id'));
+		return !!document.querySelector(`[headers~="${id}"]`);
 	}
 
 	return false;

diff --git a/lib/commons/text/accessible-text.js b/lib/commons/text/accessible-text.js
@@ -22,11 +22,8 @@ var phrasingElements = ['A', 'EM', 'STRONG', 'SMALL', 'MARK', 'ABBR', 'DFN', 'I'
 function findLabel(element) {
 	var ref = null;
 	if (element.getAttribute('id')) {
-		ref = document.querySelector(
-			'label[for="' +
-			axe.utils.escapeSelector(element.getAttribute('id')) +
-			'"]'
-		);
+		const id = axe.utils.escapeSelector(element.getAttribute('id'));
+		ref = document.querySelector(`label[for="${id}"]`);
 		if (ref) {
 			return ref;
 		}

diff --git a/lib/commons/text/label.js b/lib/commons/text/label.js
@@ -15,11 +15,8 @@ text.label = function (node) {
 
 	// explicit label
 	if (node.getAttribute('id')) {
-		ref = document.querySelector(
-			'label[for="' +
-			axe.utils.escapeSelector(node.getAttribute('id')) +
-			'"]'
-		);
+		const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+		ref = document.querySelector(`label[for="${id}"]`);
 		candidate = ref && text.visible(ref, true);
 		if (candidate) {
 			return candidate;

diff --git a/lib/rules/color-contrast-matches.js b/lib/rules/color-contrast-matches.js
@@ -56,11 +56,8 @@ if (nodeName === 'LABEL' || nodeParentLabel) {
 // label of disabled control associated w/ aria-labelledby
 if (node.getAttribute('id')) {
 	// TODO: This should check if ALL elements are disabled, not just the first
-	var candidate = doc.querySelector(
-		'[aria-labelledby~=' +
-		axe.commons.utils.escapeSelector(node.getAttribute('id')) +
-		']'
-	);
+	const id = axe.commons.utils.escapeSelector(node.getAttribute('id'));
+	const candidate = doc.querySelector(`[aria-labelledby~="${id}"]`);
 	if (candidate && candidate.hasAttribute('disabled')) {
 		return false;
 	}