Merge pull request #92 from cloudinary/CLD-12618-floating-player

CLD-12618 Floating player improvements
cloudinary · Apr 23, 2019 · f2744b1 · f2744b1
2 parents 5abebee + a51e9a7
commit f2744b1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/assets/styles/components/title-bar.scss b/src/assets/styles/components/title-bar.scss
@@ -8,6 +8,7 @@
   height: 7.2em;
   text-align: left;
   padding: 16px 21px;
+  pointer-events: none;
 
   .vjs-title-bar-title {
     width: 100%;
@@ -64,4 +65,3 @@
 .vjs-has-started.vjs-no-flex .vjs-title-bar {
   display: table;
 }
-
diff --git a/src/plugins/floating-player/floating-player.scss b/src/plugins/floating-player/floating-player.scss
@@ -32,6 +32,15 @@
       cursor: pointer;
     }
 
+    .vjs-time-control,
+    .vjs-upcoming-video-title-display,
+    .vjs-recommendations-overlay {
+      display: none;
+    }
+    .vjs-upcoming-video .vjs-upcoming-video-bar {
+      background-color: transparent;
+    }
+
     &.cld-video-player-floater-bottom-right {
       bottom: 20px !important;
       right: 20px !important;

diff --git a/src/plugins/floating-player/index.js b/src/plugins/floating-player/index.js
@@ -12,6 +12,10 @@ const defaults = {
 class FloatingPlayer {
   constructor(player, opts = {}) {
     opts = assign({}, defaults, opts);
+    // Handle non left-right values.
+    if (opts.floatTo && opts.floatTo !== 'left' && opts.floatTo !== 'right') {
+      opts.floatTo = defaults.floatTo;
+    }
 
     this.player = player;
     let _options = sliceProperties(opts, 'fraction');
@@ -41,7 +45,6 @@ class FloatingPlayer {
     };
 
     const addWindowEventHandlers = () => {
-      console.log('ADDING');
       window.addEventListener('DOMContentLoaded', checkViewportState, false);
       window.addEventListener('load', checkViewportState, false);
       window.addEventListener('scroll', checkViewportState, false);
@@ -51,7 +54,7 @@ class FloatingPlayer {
     const registerEventHandlers = () => {
       this.player.on('play', checkViewportState);
       this.player.on('play', addWindowEventHandlers);
-      this.player.on('pause', removeWindowEventHandlers);
+      // this.player.on('pause', removeWindowEventHandlers);
       this.player.on('dispose', removeWindowEventHandlers);
     };