Merge branch 'develop' into css-variables

# Conflicts:
#	src/js/captions.js
#	src/js/config/defaults.js
#	src/js/fullscreen.js
#	src/js/listeners.js
#	src/js/plyr.js

1 files changed, 12 insertions, 2 deletions

diff --git a/src/js/listeners.js b/src/js/listeners.js
index dd2c4834..2cc71537 100644
--- a/src/js/listeners.js
+++ b/src/js/listeners.js
@@ -333,7 +333,6 @@ class Listeners {
 
     const resized = () => {
       clearTimeout(timers.resized);
-
       timers.resized = setTimeout(setPlayerSize, 50);
     };
 
@@ -357,7 +356,7 @@ class Listeners {
       // Set Vimeo gutter
       setGutter(ratio, padding, isEnter);
 
-      // If not using the native browser fullscreen API, we need to check for resizes of viewport
+      // If not using native browser fullscreen API, we need to check for resizes of viewport
       if (!usingNative) {
         if (isEnter) {
           on.call(player, window, 'resize', resized);
@@ -817,6 +816,17 @@ class Listeners {
       elements.controls.hover = !player.touch && event.type === 'mouseenter';
     });
 
+    // Also update controls.hover state for any non-player children of fullscreen element (as above)
+    if (elements.fullscreen) {
+      Array.from(elements.fullscreen.children)
+        .filter(c => !c.contains(elements.container))
+        .forEach(child => {
+          this.bind(child, 'mouseenter mouseleave', event => {
+            elements.controls.hover = !player.touch && event.type === 'mouseenter';
+          });
+        });
+    }
+
     // Update controls.pressed state (used for ui.toggleControls to avoid hiding when interacting)
     this.bind(elements.controls, 'mousedown mouseup touchstart touchend touchcancel', event => {
       elements.controls.pressed = ['mousedown', 'touchstart'].includes(event.type);