Restrict re-focus to only apply for control buttons (#28)

Author: ctd1500

videojs.hotkeys.js

@@ -22,6 +22,7 @@
   var hotkeys = function(options) {
     var player = this;
     var pEl = player.el();
+    var doc = document;
     var def_options = {
       volumeStep: 0.1,
       seekStep: 5,
@@ -74,21 +75,18 @@
     }
 
     player.on('userinactive', function() {
-      var transitionTime, focusingPlayerTimeout, cancelFocusingPlayer;
-
-      transitionTime = 1000;
-
-      cancelFocusingPlayer = function(){
+      // When the control bar fades, re-apply focus to the player if last focus was a control button
+      var cancelFocusingPlayer = function() {
         clearTimeout(focusingPlayerTimeout);
       };
-
-      focusingPlayerTimeout = setTimeout(function(){
+      var focusingPlayerTimeout = setTimeout(function() {
         player.off('useractive', cancelFocusingPlayer);
-        pEl.focus();
-      }, transitionTime);
+        if (doc.activeElement.parentElement == pEl.querySelector('.vjs-control-bar')) {
+          pEl.focus();
+        }
+      }, 10);
 
       player.one('useractive', cancelFocusingPlayer);
-
     });
 
     player.on('play', function() {
@@ -107,7 +105,7 @@
       if (player.controls()) {
 
         // Don't catch keys if any control buttons are focused, unless alwaysCaptureHotkeys is true
-        var activeEl = document.activeElement;
+        var activeEl = doc.activeElement;
         if (alwaysCaptureHotkeys ||
             activeEl == pEl ||
             activeEl == pEl.querySelector('.vjs-tech') ||
@@ -223,7 +221,7 @@
       if (player.controls()) {
 
         // Don't catch clicks if any control buttons are focused
-        var activeEl = event.relatedTarget || event.toElement || document.activeElement;
+        var activeEl = event.relatedTarget || event.toElement || doc.activeElement;
         if (activeEl == pEl ||
             activeEl == pEl.querySelector('.vjs-tech') ||
             activeEl == pEl.querySelector('.iframeblocker')) {
@@ -242,7 +240,7 @@
     var mouseScroll = function mouseScroll(event) {
       // When controls are disabled, hotkeys will be disabled as well
       if (player.controls()) {
-        var activeEl = event.relatedTarget || event.toElement || document.activeElement;
+        var activeEl = event.relatedTarget || event.toElement || doc.activeElement;
         if (alwaysCaptureHotkeys ||
             activeEl == pEl ||
             activeEl == pEl.querySelector('.vjs-tech') ||