Merge branch 'stable'

jgubman · Apr 5, 2016 · 002b739 · 002b739
2 parents 41f8e7b + 0f40f3f
commit 002b739
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
 * @OwenEdwards fixed links adding extra tab stop with IE by removing anchor tags on videojs init ([view](https://github.com/videojs/video.js/pull/3194))
 * @scaryguy updated videojs cdn urls in the README ([view](https://github.com/videojs/video.js/pull/3195))
 * @mister-ben updated the time tooltips to use the chosen font family ([view](https://github.com/videojs/video.js/pull/3213))
+* @OwenEdwards improved handling of deprecated use of Button component ([view](https://github.com/videojs/video.js/pull/3236))
 
 --------------------
 

diff --git a/src/js/button.js b/src/js/button.js
@@ -39,6 +39,16 @@ class Button extends ClickableComponent {
 
     if (tag !== 'button') {
       log.warn(`Creating a Button with an HTML element of ${tag} is deprecated; use ClickableComponent instead.`);
+
+      // Add properties for clickable element which is not a native HTML button
+      props = assign({
+        tabIndex: 0
+      }, props);
+
+      // Add ARIA attributes for clickable element which is not a native HTML button
+      attributes = assign({
+        role: 'button'
+      }, attributes);
     }
 
     // Add attributes for button element