ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for cue points missing

Browse Source
This commit is contained in:
Sam Potts
2019-02-07 23:45:19 +11:00
parent eb628c8e4f
commit dbd2136bac
18 changed files with 408 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
demo/dist/demo.js vendored
View File

@ -4796,28 +4796,6 @@ typeof navigator === "object" && (function () {
ui: ui
};
},
// Detect support for autoplay
/* autoplay: (() => {
const video = document.createElement('video');
video.src = 'https://cdn.plyr.io/static/blank.mp4';
const promise = video.play();
if (is.promise(promise)) {
console.warn('PROMISE', promise);
promise
.then(() => {
console.warn('supported');
return true;
})
.catch(() => {
console.warn('not supported');
return false;
});
} else {
console.warn('supported - no promise');
return true;
}
})(), */
// Picture-in-picture support
// Safari & Chrome only currently
pip: function () {
@ -10288,25 +10266,7 @@ typeof navigator === "object" && (function () {
this.manager = event.getAdsManager(this.player, settings); // Get the cue points for any mid-rolls by filtering out the pre- and post-roll
this.cuePoints = this.manager.getCuePoints(); // Add advertisement cue's within the time line if available
if (!is.empty(this.cuePoints)) {
this.cuePoints.forEach(function (cuePoint) {
if (cuePoint !== 0 && cuePoint !== -1 && cuePoint < _this6.player.duration) {
var seekElement = _this6.player.elements.progress;
if (is.element(seekElement)) {
var cuePercentage = 100 / _this6.player.duration * cuePoint;
var cue = createElement('span', {
class: _this6.player.config.classNames.cues
});
cue.style.left = "".concat(cuePercentage.toString(), "%");
seekElement.appendChild(cue);
}
}
});
} // Set volume to match player
this.cuePoints = this.manager.getCuePoints(); // Set volume to match player
this.manager.setVolume(this.player.volume); // Add listeners to the required events
// Advertisement error events
@ -10323,6 +10283,29 @@ typeof navigator === "object" && (function () {
this.trigger('loaded');
}
}, {
key: "addCuePoints",
value: function addCuePoints() {
var _this7 = this;
// Add advertisement cue's within the time line if available
if (!is.empty(this.cuePoints)) {
this.cuePoints.forEach(function (cuePoint) {
if (cuePoint !== 0 && cuePoint !== -1 && cuePoint < _this7.player.duration) {
var seekElement = _this7.player.elements.progress;
if (is.element(seekElement)) {
var cuePercentage = 100 / _this7.player.duration * cuePoint;
var cue = createElement('span', {
class: _this7.player.config.classNames.cues
});
cue.style.left = "".concat(cuePercentage.toString(), "%");
seekElement.appendChild(cue);
}
}
});
}
}
/**
* This is where all the event handling takes place. Retrieve the ad from the event. Some
* events (e.g. ALL_ADS_COMPLETED) don't have the ad object associated
@ -10333,7 +10316,7 @@ typeof navigator === "object" && (function () {
}, {
key: "onAdEvent",
value: function onAdEvent(event) {
var _this7 = this;
var _this8 = this;
var container = this.player.elements.container; // Retrieve the ad from the event. Some events (e.g. ALL_ADS_COMPLETED)
// don't have ad object associated
@ -10343,7 +10326,7 @@ typeof navigator === "object" && (function () {
var dispatchEvent = function dispatchEvent(type) {
var event = "ads".concat(type.replace(/_/g, '').toLowerCase());
triggerEvent.call(_this7.player, _this7.player.media, event);
triggerEvent.call(_this8.player, _this8.player.media, event);
};
switch (event.type) {
@ -10452,37 +10435,39 @@ typeof navigator === "object" && (function () {
}, {
key: "listeners",
value: function listeners() {
var _this8 = this;
var _this9 = this;
var container = this.player.elements.container;
var time; // Add listeners to the required events
var time;
this.player.on('canplay', function () {
_this9.addCuePoints();
});
this.player.on('ended', function () {
_this8.loader.contentComplete();
_this9.loader.contentComplete();
});
this.player.on('timeupdate', function () {
time = _this8.player.currentTime;
time = _this9.player.currentTime;
});
this.player.on('seeked', function () {
var seekedTime = _this8.player.currentTime;
var seekedTime = _this9.player.currentTime;
if (is.empty(_this8.cuePoints)) {
if (is.empty(_this9.cuePoints)) {
return;
}
_this8.cuePoints.forEach(function (cuePoint, index) {
_this9.cuePoints.forEach(function (cuePoint, index) {
if (time < cuePoint && cuePoint < seekedTime) {
_this8.manager.discardAdBreak();
_this9.manager.discardAdBreak();
_this8.cuePoints.splice(index, 1);
_this9.cuePoints.splice(index, 1);
}
});
}); // Listen to the resizing of the window. And resize ad accordingly
// TODO: eventually implement ResizeObserver
window.addEventListener('resize', function () {
if (_this8.manager) {
_this8.manager.resize(container.offsetWidth, container.offsetHeight, google.ima.ViewMode.NORMAL);
if (_this9.manager) {
_this9.manager.resize(container.offsetWidth, container.offsetHeight, google.ima.ViewMode.NORMAL);
}
});
}
@ -10493,7 +10478,7 @@ typeof navigator === "object" && (function () {
}, {
key: "play",
value: function play() {
var _this9 = this;
var _this10 = this;
var container = this.player.elements.container;
@ -10504,23 +10489,23 @@ typeof navigator === "object" && (function () {
this.managerPromise.then(function () {
// Initialize the container. Must be done via a user action on mobile devices
_this9.elements.displayContainer.initialize();
_this10.elements.displayContainer.initialize();
try {
if (!_this9.initialized) {
if (!_this10.initialized) {
// Initialize the ads manager. Ad rules playlist will start at this time
_this9.manager.init(container.offsetWidth, container.offsetHeight, google.ima.ViewMode.NORMAL); // Call play to start showing the ad. Single video and overlay ads will
_this10.manager.init(container.offsetWidth, container.offsetHeight, google.ima.ViewMode.NORMAL); // Call play to start showing the ad. Single video and overlay ads will
// start at this time; the call will be ignored for ad rules
_this9.manager.start();
_this10.manager.start();
}
_this9.initialized = true;
_this10.initialized = true;
} catch (adError) {
// An error may be thrown if there was a problem with the
// VAST response
_this9.onAdError(adError);
_this10.onAdError(adError);
}
}).catch(function () {});
}
@ -10579,23 +10564,23 @@ typeof navigator === "object" && (function () {
}, {
key: "loadAds",
value: function loadAds() {
var _this10 = this;
var _this11 = this;
// Tell our adsManager to go bye bye
this.managerPromise.then(function () {
// Destroy our adsManager
if (_this10.manager) {
_this10.manager.destroy();
if (_this11.manager) {
_this11.manager.destroy();
} // Re-set our adsManager promises
_this10.managerPromise = new Promise(function (resolve) {
_this10.on('loaded', resolve);
_this11.managerPromise = new Promise(function (resolve) {
_this11.on('loaded', resolve);
_this10.player.debug.log(_this10.manager);
_this11.player.debug.log(_this11.manager);
}); // Now request some new advertisements
_this10.requestAds();
_this11.requestAds();
}).catch(function () {});
}
/**
@ -10606,7 +10591,7 @@ typeof navigator === "object" && (function () {
}, {
key: "trigger",
value: function trigger(event) {
var _this11 = this;
var _this12 = this;
for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
args[_key - 1] = arguments[_key];
@ -10617,7 +10602,7 @@ typeof navigator === "object" && (function () {
if (is.array(handlers)) {
handlers.forEach(function (handler) {
if (is.function(handler)) {
handler.apply(_this11, args);
handler.apply(_this12, args);
}
});
}
@ -10651,13 +10636,13 @@ typeof navigator === "object" && (function () {
}, {
key: "startSafetyTimer",
value: function startSafetyTimer(time, from) {
var _this12 = this;
var _this13 = this;
this.player.debug.log("Safety timer invoked from: ".concat(from));
this.safetyTimer = setTimeout(function () {
_this12.cancel();
_this13.cancel();
_this12.clearSafetyTimer('startSafetyTimer()');
_this13.clearSafetyTimer('startSafetyTimer()');
}, time);
}
/**

2
demo/dist/demo.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
demo/dist/demo.min.js.map vendored
View File

File diff suppressed because one or more lines are too long