chore: Fix merge issue with isFocusable

dequelabs · Dec 15, 2017 · 08af138 · 08af138
1 parent 1ab4629
commit 08af138
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/checks/navigation/region.js b/lib/checks/navigation/region.js
@@ -10,7 +10,7 @@ const implicitLandmarks = landmarkRoles
 
 function isSkipLink(n) {
 	return firstLink &&
-		axe.commons.dom.isFocusable(axe.commons.dom.getElementByReference(firstLink, 'href')) &&
+		axe.commons.dom.getElementByReference(firstLink, 'href') &&
 		firstLink === n;
 }
 

diff --git a/lib/checks/navigation/skip-link.js b/lib/checks/navigation/skip-link.js
@@ -1 +1,2 @@
-return axe.commons.dom.isFocusable(axe.commons.dom.getElementByReference(node, 'href'));
+const target = axe.commons.dom.getElementByReference(node, 'href');
+return !!target && axe.commons.dom.isFocusable(target);
diff --git a/lib/commons/dom/is-focusable.js b/lib/commons/dom/is-focusable.js
@@ -1,4 +1,4 @@
-/* global dom */
+/* global console, dom */
 /* jshint maxcomplexity: 20 */
 /**
  * Determines if an element is focusable
@@ -11,7 +11,7 @@
 
 dom.isFocusable = function (el) {
 	'use strict';
-
+	console.log(el);
 	if (dom.isNativelyFocusable(el)) {
 		return true;
 	}