From 6088f86ce68de5782b53de099542239fab4d6152 Mon Sep 17 00:00:00 2001 From: Shawn Busolits Date: Thu, 31 May 2018 17:04:38 -0400 Subject: [PATCH] fix: Call startLinearAdMode on post-rolls. Fixes an issue where contrib-ads thought we were timing out on all post-rolls.\Fixes #620. (#631) --- package-lock.json | 2 +- src/controller.js | 2 +- src/player-wrapper.js | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index ddf33aa0..08651efa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3884,7 +3884,7 @@ "iconv-lite": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "integrity": "sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs=", "dev": true }, "ignore": { diff --git a/src/controller.js b/src/controller.js index 8b92e34d..c772b12d 100644 --- a/src/controller.js +++ b/src/controller.js @@ -294,7 +294,7 @@ Controller.prototype.onAdError = function(adErrorEvent) { * @param {Object} adEvent The event fired by the IMA SDK. */ Controller.prototype.onAdBreakStart = function(adEvent) { - this.playerWrapper.onAdBreakStart(adEvent); + this.playerWrapper.onAdBreakStart(); this.adUi.onAdBreakStart(adEvent); }; diff --git a/src/player-wrapper.js b/src/player-wrapper.js index 257705b2..41037398 100644 --- a/src/player-wrapper.js +++ b/src/player-wrapper.js @@ -456,16 +456,11 @@ PlayerWrapper.prototype.onAdError = function(adErrorEvent) { /** * Handles ad break starting. - * - * @param {Object} adEvent The event fired by the IMA SDK. */ -PlayerWrapper.prototype.onAdBreakStart = function(adEvent) { +PlayerWrapper.prototype.onAdBreakStart = function() { this.contentSource = this.vjsPlayer.currentSrc(); this.vjsPlayer.off('contentended', this.boundContentEndedListener); - if (adEvent.getAd().getAdPodInfo().getPodIndex() != -1) { - // Skip this call for post-roll ads - this.vjsPlayer.ads.startLinearAdMode(); - } + this.vjsPlayer.ads.startLinearAdMode(); this.vjsControls.hide(); this.vjsPlayer.pause(); };