aboutsummaryrefslogtreecommitdiffstats
path: root/src/js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2018-03-13 21:42:01 +1100
committerSam Potts <sam@potts.es>2018-03-13 21:42:01 +1100
commit1b13ddaa5479baa8100e953e5d0752e3bd8654ab (patch)
tree736b1a2621b929d1fe6850d25c57c5b1c34c2791 /src/js
parent9981c349be60157dbaeaa3123a6ce44f312dc27a (diff)
downloadplyr-1b13ddaa5479baa8100e953e5d0752e3bd8654ab.tar.lz
plyr-1b13ddaa5479baa8100e953e5d0752e3bd8654ab.tar.xz
plyr-1b13ddaa5479baa8100e953e5d0752e3bd8654ab.zip
Update ads
Diffstat (limited to 'src/js')
-rw-r--r--src/js/defaults.js2
-rw-r--r--src/js/plugins/ads.js25
2 files changed, 8 insertions, 19 deletions
diff --git a/src/js/defaults.js b/src/js/defaults.js
index 086caefe..9757ef8a 100644
--- a/src/js/defaults.js
+++ b/src/js/defaults.js
@@ -376,7 +376,7 @@ const defaults = {
// Register for an account here: http://vi.ai/publisher-video-monetization/?aid=plyrio
ads: {
enabled: false,
- publisherId: null,
+ publisherId: '918848828995742',
},
};
diff --git a/src/js/plugins/ads.js b/src/js/plugins/ads.js
index a73ff934..cbbf3a47 100644
--- a/src/js/plugins/ads.js
+++ b/src/js/plugins/ads.js
@@ -256,7 +256,8 @@ class Ads {
// Proxy event
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) {
@@ -266,7 +267,7 @@ class Ads {
this.trigger('loaded');
// Bubble event
- dispatchEvent('loaded');
+ dispatchEvent(event.type);
// Start countdown
this.pollCountdown(true);
@@ -286,7 +287,7 @@ class Ads {
// in case the video is re-played
// Fire event
- dispatchEvent('allcomplete');
+ dispatchEvent(event.type);
// 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.
@@ -319,7 +320,7 @@ class Ads {
// 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
- dispatchEvent('contentpause');
+ dispatchEvent(event.type);
this.pauseContent();
@@ -331,7 +332,7 @@ class Ads {
// Fired when content should be resumed. This usually happens when an ad finishes
// or collapses
- dispatchEvent('contentresume');
+ dispatchEvent(event.type);
this.pollCountdown();
@@ -340,23 +341,11 @@ class Ads {
break;
case google.ima.AdEvent.Type.STARTED:
- dispatchEvent('started');
- break;
-
case google.ima.AdEvent.Type.MIDPOINT:
- dispatchEvent('midpoint');
- break;
-
case google.ima.AdEvent.Type.COMPLETE:
- dispatchEvent('complete');
- break;
-
case google.ima.AdEvent.Type.IMPRESSION:
- dispatchEvent('impression');
- break;
-
case google.ima.AdEvent.Type.CLICK:
- dispatchEvent('click');
+ dispatchEvent(event.type);
break;
default: