Merge pull request #502 from /issues/501@v2

dom: Wrong result of isFocusable() for link without href but with tabindex attribute
bem · Apr 17, 2014 · ac36c3e · ac36c3e
2 parents c03a8de + 0cb2c43
commit ac36c3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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 */{
     }
 });
 
-});
+});
diff --git 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($('<span tabindex="4"/>')).should.be.true;
+            dom.isFocusable($('<a tabindex="5"/>')).should.be.true;
             dom.isFocusable($('<span/>')).should.be.false;
         });