diff --git a/common.blocks/dom/dom.js b/common.blocks/dom/dom.js
index c334cfa2..45b6fb07 100644
--- a/common.blocks/dom/dom.js
+++ b/common.blocks/dom/dom.js
@@ -54,6 +54,7 @@ provide(/** @exports */{
var domNode = domElem[0];
if(!domNode) return false;
+ if(domNode.hasAttribute('tabindex')) return true;
switch(domNode.tagName.toLowerCase()) {
case 'iframe':
@@ -67,10 +68,9 @@ provide(/** @exports */{
case 'a':
return !!domNode.href;
-
- default:
- return domNode.hasAttribute('tabindex');
}
+
+ return false;
},
/**
@@ -97,4 +97,4 @@ provide(/** @exports */{
}
});
-});
\ No newline at end of file
+});
diff --git a/common.blocks/dom/dom.spec.js b/common.blocks/dom/dom.spec.js
index 78b77c21..2e1f1dbc 100644
--- a/common.blocks/dom/dom.spec.js
+++ b/common.blocks/dom/dom.spec.js
@@ -72,6 +72,7 @@ describe('dom', function() {
it('should returns true if given DOM elem has tabindex', function() {
dom.isFocusable($('')).should.be.true;
+ dom.isFocusable($('')).should.be.true;
dom.isFocusable($('')).should.be.false;
});