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

Update ads

Browse Source
This commit is contained in:
Sam Potts 2018-03-13 21:42:01 +11:00
parent 9981c349be
commit 1b13ddaa54
11 changed files with 28 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demo/src/js/demo.js
View File

@ -53,7 +53,6 @@ document.addEventListener('DOMContentLoaded', () => {
}, },
ads: { ads: {
enabled: true, enabled: true,
publisherId: 'plyrio',
}, },
}); });

25
dist/plyr.js vendored
View File

@ -4662,7 +4662,8 @@ var Ads = function () {
// Proxy event // Proxy event
var dispatchEvent = function dispatchEvent(type) { var dispatchEvent = function dispatchEvent(type) {
utils.dispatchEvent.call(_this7.player, _this7.player.media, 'ads' + type); var event = 'ads' + type.replace(/_/g, ' ').toLowerCase();
utils.dispatchEvent.call(_this7.player, _this7.player.media, event);
}; };
switch (event.type) { switch (event.type) {
@ -4672,7 +4673,7 @@ var Ads = function () {
this.trigger('loaded'); this.trigger('loaded');
// Bubble event // Bubble event
dispatchEvent('loaded'); dispatchEvent(event.type);
// Start countdown // Start countdown
this.pollCountdown(true); this.pollCountdown(true);
@ -4692,7 +4693,7 @@ var Ads = function () {
// in case the video is re-played // in case the video is re-played
// Fire event // Fire event
dispatchEvent('allcomplete'); dispatchEvent(event.type);
// TODO: Example for what happens when a next video in a playlist would be loaded. // TODO: Example for what happens when a next video in a playlist would be loaded.
// So here we load a new video when all ads are done. // So here we load a new video when all ads are done.
@ -4725,7 +4726,7 @@ var Ads = function () {
// for example display a pause button and remaining time. Fired when content should // for example display a pause button and remaining time. Fired when content should
// be paused. This usually happens right before an ad is about to cover the content // be paused. This usually happens right before an ad is about to cover the content
dispatchEvent('contentpause'); dispatchEvent(event.type);
this.pauseContent(); this.pauseContent();
@ -4737,7 +4738,7 @@ var Ads = function () {
// Fired when content should be resumed. This usually happens when an ad finishes // Fired when content should be resumed. This usually happens when an ad finishes
// or collapses // or collapses
dispatchEvent('contentresume'); dispatchEvent(event.type);
this.pollCountdown(); this.pollCountdown();
@ -4746,23 +4747,11 @@ var Ads = function () {
break; break;
case google.ima.AdEvent.Type.STARTED: case google.ima.AdEvent.Type.STARTED:
dispatchEvent('started');
break;
case google.ima.AdEvent.Type.MIDPOINT: case google.ima.AdEvent.Type.MIDPOINT:
dispatchEvent('midpoint');
break;
case google.ima.AdEvent.Type.COMPLETE: case google.ima.AdEvent.Type.COMPLETE:
dispatchEvent('complete');
break;
case google.ima.AdEvent.Type.IMPRESSION: case google.ima.AdEvent.Type.IMPRESSION:
dispatchEvent('impression');
break;
case google.ima.AdEvent.Type.CLICK: case google.ima.AdEvent.Type.CLICK:
dispatchEvent('click'); dispatchEvent(event.type);
break; break;
default: default:

2
dist/plyr.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

25
dist/plyr.polyfilled.js vendored
View File

@ -10570,7 +10570,8 @@ var Ads = function () {
// Proxy event // Proxy event
var dispatchEvent = function dispatchEvent(type) { var dispatchEvent = function dispatchEvent(type) {
utils.dispatchEvent.call(_this7.player, _this7.player.media, 'ads' + type); var event = 'ads' + type.replace(/_/g, ' ').toLowerCase();
utils.dispatchEvent.call(_this7.player, _this7.player.media, event);
}; };
switch (event.type) { switch (event.type) {
@ -10580,7 +10581,7 @@ var Ads = function () {
this.trigger('loaded'); this.trigger('loaded');
// Bubble event // Bubble event
dispatchEvent('loaded'); dispatchEvent(event.type);
// Start countdown // Start countdown
this.pollCountdown(true); this.pollCountdown(true);
@ -10600,7 +10601,7 @@ var Ads = function () {
// in case the video is re-played // in case the video is re-played
// Fire event // Fire event
dispatchEvent('allcomplete'); dispatchEvent(event.type);
// TODO: Example for what happens when a next video in a playlist would be loaded. // TODO: Example for what happens when a next video in a playlist would be loaded.
// So here we load a new video when all ads are done. // So here we load a new video when all ads are done.
@ -10633,7 +10634,7 @@ var Ads = function () {
// for example display a pause button and remaining time. Fired when content should // for example display a pause button and remaining time. Fired when content should
// be paused. This usually happens right before an ad is about to cover the content // be paused. This usually happens right before an ad is about to cover the content
dispatchEvent('contentpause'); dispatchEvent(event.type);
this.pauseContent(); this.pauseContent();
@ -10645,7 +10646,7 @@ var Ads = function () {
// Fired when content should be resumed. This usually happens when an ad finishes // Fired when content should be resumed. This usually happens when an ad finishes
// or collapses // or collapses
dispatchEvent('contentresume'); dispatchEvent(event.type);
this.pollCountdown(); this.pollCountdown();
@ -10654,23 +10655,11 @@ var Ads = function () {
break; break;
case google.ima.AdEvent.Type.STARTED: case google.ima.AdEvent.Type.STARTED:
dispatchEvent('started');
break;
case google.ima.AdEvent.Type.MIDPOINT: case google.ima.AdEvent.Type.MIDPOINT:
dispatchEvent('midpoint');
break;
case google.ima.AdEvent.Type.COMPLETE: case google.ima.AdEvent.Type.COMPLETE:
dispatchEvent('complete');
break;
case google.ima.AdEvent.Type.IMPRESSION: case google.ima.AdEvent.Type.IMPRESSION:
dispatchEvent('impression');
break;
case google.ima.AdEvent.Type.CLICK: case google.ima.AdEvent.Type.CLICK:
dispatchEvent('click'); dispatchEvent(event.type);
break; break;
default: default:

2
dist/plyr.polyfilled.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.polyfilled.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.polyfilled.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/js/defaults.js
View File

@ -376,7 +376,7 @@ const defaults = {
// Register for an account here: http://vi.ai/publisher-video-monetization/?aid=plyrio // Register for an account here: http://vi.ai/publisher-video-monetization/?aid=plyrio
ads: { ads: {
enabled: false, enabled: false,
publisherId: null, publisherId: '918848828995742',
}, },
}; };

25
src/js/plugins/ads.js
View File

@ -256,7 +256,8 @@ class Ads {
// Proxy event // Proxy event
const dispatchEvent = type => { const dispatchEvent = type => {
utils.dispatchEvent.call(this.player, this.player.media, `ads${type}`); const event = `ads${type.replace(/_/g, '').toLowerCase()}`;
utils.dispatchEvent.call(this.player, this.player.media, event);
}; };
switch (event.type) { switch (event.type) {
@ -266,7 +267,7 @@ class Ads {
this.trigger('loaded'); this.trigger('loaded');
// Bubble event // Bubble event
dispatchEvent('loaded'); dispatchEvent(event.type);
// Start countdown // Start countdown
this.pollCountdown(true); this.pollCountdown(true);
@ -286,7 +287,7 @@ class Ads {
// in case the video is re-played // in case the video is re-played
// Fire event // Fire event
dispatchEvent('allcomplete'); dispatchEvent(event.type);
// TODO: Example for what happens when a next video in a playlist would be loaded. // TODO: Example for what happens when a next video in a playlist would be loaded.
// So here we load a new video when all ads are done. // So here we load a new video when all ads are done.
@ -319,7 +320,7 @@ class Ads {
// for example display a pause button and remaining time. Fired when content should // for example display a pause button and remaining time. Fired when content should
// be paused. This usually happens right before an ad is about to cover the content // be paused. This usually happens right before an ad is about to cover the content
dispatchEvent('contentpause'); dispatchEvent(event.type);
this.pauseContent(); this.pauseContent();
@ -331,7 +332,7 @@ class Ads {
// Fired when content should be resumed. This usually happens when an ad finishes // Fired when content should be resumed. This usually happens when an ad finishes
// or collapses // or collapses
dispatchEvent('contentresume'); dispatchEvent(event.type);
this.pollCountdown(); this.pollCountdown();
@ -340,23 +341,11 @@ class Ads {
break; break;
case google.ima.AdEvent.Type.STARTED: case google.ima.AdEvent.Type.STARTED:
dispatchEvent('started');
break;
case google.ima.AdEvent.Type.MIDPOINT: case google.ima.AdEvent.Type.MIDPOINT:
dispatchEvent('midpoint');
break;
case google.ima.AdEvent.Type.COMPLETE: case google.ima.AdEvent.Type.COMPLETE:
dispatchEvent('complete');
break;
case google.ima.AdEvent.Type.IMPRESSION: case google.ima.AdEvent.Type.IMPRESSION:
dispatchEvent('impression');
break;
case google.ima.AdEvent.Type.CLICK: case google.ima.AdEvent.Type.CLICK:
dispatchEvent('click'); dispatchEvent(event.type);
break; break;
default: default: