pageflow 16.0.0 → 16.2.0

data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/frontend.js

@@ -4075,7 +4075,7 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
     };
 
     player.targetVolume = function () {
-      return settings.get('volume') * volumeFactor;
+      return (options.ignoreVolumeSetting ? 1 : settings.get('volume')) * volumeFactor;
     };
 
     function listenToVolumeSetting() {
@@ -4446,7 +4446,21 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
   mediaPlayer.volumeFading = volumeFading;
   mediaPlayer.loadWaiting = loadWaiting;
   mediaPlayer.hooks = hooks;
-  mediaPlayer.asyncPlay = asyncPlay;
+  mediaPlayer.asyncPlay = asyncPlay; // Replacement for Underscore's throttle, because scrolled entries
+  // don't have Underscore anymore
+
+  function throttle(func, timeFrame) {
+    var lastTime = 0;
+    return function (options) {
+      var now = new Date();
+      func = func.bind(this);
+
+      if (now - lastTime >= timeFrame) {
+        func(options);
+        lastTime = now;
+      }
+    };
+  }
 
   var mediaEvents = function mediaEvents(player, context) {
     function triggerMediaEvent(name) {
@@ -4466,6 +4480,9 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
     player.on('timeupdate', function () {
       triggerMediaEvent('timeupdate');
     });
+    player.on('timeupdate', throttle(function () {
+      triggerMediaEvent('timeupdate_throttled');
+    }, 5000));
     player.on('pause', function () {
       triggerMediaEvent('pause');
     });
@@ -4984,6 +5001,9 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
     player.on('timeupdate', function () {
       triggerMediaEvent('timeupdate');
     });
+    player.on('timeupdate', throttle(function () {
+      triggerMediaEvent('timeupdate_throttled');
+    }, 5000));
     player.on('pause', function () {
       triggerMediaEvent('pause');
     });
@@ -5125,11 +5145,13 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
         nativeCaptions: !isAudio && browser.has('iphone platform'),
         // Only used by pageflow-scrolled
         vhs: {
-          useBandwidthFromLocalStorage: true
+          useBandwidthFromLocalStorage: true,
+          usePlayerObjectFit: true
         }
       },
       bufferUnderrunWaiting: true,
       fallbackToMutedAutoplay: !isAudio,
+      ignoreVolumeSetting: true,
       volumeFading: true,
       hooks: {},
       mediaEvents: true,
@@ -5358,13 +5380,16 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
           tagName: type
         });
         mediaEl.setAttribute('src', blankSources[type].src);
+        player.muted(true);
         this.unAllocatedPlayers[type].push(player);
         return player;
       }
     }, {
       key: "initializeMediaPool_",
       value: function initializeMediaPool_(type, mediaElSeed) {
-        while (this.allPlayersForType(type).length < this.playerCount) {
+        var playerCount = typeof this.playerCount === 'function' ? this.playerCount(type) : this.playerCount;
+
+        while (this.allPlayersForType(type).length < playerCount) {
           this.createPlayer_(type, mediaElSeed.cloneNode(true));
         }
       }
@@ -5396,7 +5421,11 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
   }
 
   var media = {
-    playerPool: new MediaPool(),
+    playerPool: new MediaPool({
+      playerCount: function playerCount() {
+        return features.isEnabled('large_player_pool') ? 10 : 4;
+      }
+    }),
     muteState: true,
 
     get muted() {