Merge pull request #105 from cloudinary/CLD-13628-autoplay-floating

CLD-13628 autoplay-on-scroll pauses floating players
cloudinary · Jul 7, 2019 · 82983d1 · 82983d1
2 parents 7e0d6bf + b970207
commit 82983d1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 50 deletions.
diff --git a/docs/subtitles-and-captions.html b/docs/subtitles-and-captions.html
@@ -22,57 +22,33 @@
 
       var cld = cloudinary.Cloudinary.new({ cloud_name: 'yaronr' });
 
-/*      var player = cld.videoPlayer('player', {
-        publicId: 'stubhub',
-        textTracks: {
-          captions: {
-            label: 'English captions',
-            language: 'en',
-            default: true,
-            url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558965984/Meetup_english.vtt'
-          },
-          subtitles: [
-            {
-              label: 'German subtitles',
-              language: 'de',
-              url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558966008/Meetup_german.vtt'
+      var player = cld.videoPlayer('player');
+
+      player.source(
+        'stubhub',
+        {
+          textTracks: {
+            captions: {
+              label: 'English captions',
+              language: 'en',
+              default: true,
+              url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558965984/Meetup_english.vtt'
             },
-            {
-              label: 'Russian subtitles',
-              language: 'ru',
-              url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558966053/Meetup_russian.vtt'
-            }
-          ]
+            subtitles: [
+              {
+                label: 'German subtitles',
+                language: 'de',
+                url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558966008/Meetup_german.vtt'
+              },
+              {
+                label: 'Russian subtitles',
+                language: 'ru',
+                url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558966053/Meetup_russian.vtt'
+              }
+            ]
+          }
         }
-      });*/
-
-       var player = cld.videoPlayer('player');
-
-       player.source(
-         'stubhub',
-         {
-           textTracks: {
-             captions: {
-               label: 'English captions',
-               language: 'en',
-               default: true,
-               url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558965984/Meetup_english.vtt'
-             },
-             subtitles: [
-               {
-                 label: 'German subtitles',
-                 language: 'de',
-                 url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558966008/Meetup_german.vtt'
-               },
-               {
-                 label: 'Russian subtitles',
-                 language: 'ru',
-                 url: 'https://res.cloudinary.com/yaronr/raw/upload/v1558966053/Meetup_russian.vtt'
-               }
-             ]
-           }
-         }
-       );
+      );
 
     }, false);
   </script>

diff --git a/src/plugins/autoplay-on-scroll/index.js b/src/plugins/autoplay-on-scroll/index.js
@@ -51,7 +51,7 @@ class AutoplayOnScrollPlugin {
         if (this.player.paused()) {
           play();
         }
-      } else if (!this.player.paused()) {
+      } else if (!this.player.paused() && !this.player.activePlugins_.floatingPlayer) {
         pause();
       }
     };