change back to getters

dequelabs · May 23, 2019 · 86991b9 · 86991b9
1 parent 2b80529
commit 86991b9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/lib/checks/keyboard/focusable-content.js b/lib/checks/keyboard/focusable-content.js
@@ -2,7 +2,7 @@
  * Note:
  * Check if given node contains focusable elements (excluding thyself)
  */
-const tabbableElements = virtualNode.tabbableElements();
+const tabbableElements = virtualNode.tabbableElements;
 
 if (!tabbableElements) {
 	return false;

diff --git a/lib/checks/keyboard/focusable-disabled.js b/lib/checks/keyboard/focusable-disabled.js
@@ -6,7 +6,7 @@ const elementsThatCanBeDisabled = [
 	'TEXTAREA'
 ];
 
-const tabbableElements = virtualNode.tabbableElements();
+const tabbableElements = virtualNode.tabbableElements;
 
 if (!tabbableElements || !tabbableElements.length) {
 	return true;

diff --git a/lib/checks/keyboard/focusable-element.js b/lib/checks/keyboard/focusable-element.js
@@ -4,7 +4,7 @@
  * - if element is focusable
  * - if element is in focus order via `tabindex`
  */
-const isFocusable = virtualNode.isFocusable();
+const isFocusable = virtualNode.isFocusable;
 
 let tabIndex = parseInt(virtualNode.actualNode.getAttribute('tabindex'), 10);
 tabIndex = !isNaN(tabIndex) ? tabIndex : null;

diff --git a/lib/checks/keyboard/focusable-not-tabbable.js b/lib/checks/keyboard/focusable-not-tabbable.js
@@ -6,7 +6,7 @@ const elementsThatCanBeDisabled = [
 	'TEXTAREA'
 ];
 
-const tabbableElements = virtualNode.tabbableElements();
+const tabbableElements = virtualNode.tabbableElements;
 
 if (!tabbableElements || !tabbableElements.length) {
 	return true;

diff --git a/lib/commons/dom/get-tabbable-elements.js b/lib/commons/dom/get-tabbable-elements.js
@@ -12,7 +12,7 @@ dom.getTabbableElements = function getTabbableElements(virtualNode) {
 	const nodeAndDescendents = axe.utils.querySelectorAll(virtualNode, '*');
 
 	const tabbableElements = nodeAndDescendents.filter(vNode => {
-		const isFocusable = vNode.isFocusable();
+		const isFocusable = vNode.isFocusable;
 		let tabIndex = vNode.actualNode.getAttribute('tabindex');
 		tabIndex =
 			tabIndex && !isNaN(parseInt(tabIndex, 10)) ? parseInt(tabIndex) : null;

diff --git a/lib/core/base/virtual-node.js b/lib/core/base/virtual-node.js
@@ -65,7 +65,7 @@ class VirtualNode {
 	 * Determine if the element is focusable and cache the result.
 	 * @return {Boolean} True if the element is focusable, false otherwise.
 	 */
-	isFocusable() {
+	get isFocusable() {
 		if (!this._cache.hasOwnProperty('isFocusable')) {
 			this._cache.isFocusable = axe.commons.dom.isFocusable(this.actualNode);
 		}
@@ -76,7 +76,7 @@ class VirtualNode {
 	 * Return the list of tabbable elements for this element and cache the result.
 	 * @returns {VirtualNode[]}
 	 */
-	tabbableElements() {
+	get tabbableElements() {
 		if (!this._cache.hasOwnProperty('tabbableElements')) {
 			this._cache.tabbableElements = axe.commons.dom.getTabbableElements(this);
 		}