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

Renamed property, UI tweak

Browse Source
This commit is contained in:
Sam Potts
2018-01-23 10:31:21 +11:00
parent 3c8acb4e9e
commit cc128e6088
12 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/defaults.js
View File

@ -179,7 +179,6 @@ const defaults = {
reset: 'Reset',
none: 'None',
disabled: 'Disabled',
adCountdown: 'Ad - {countdown}',
},
// URLs
@ -365,7 +364,7 @@ const defaults = {
// Ads
ads: {
tagUrl: null,
tag: null,
},
};

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

@ -18,7 +18,7 @@ class Ads {
this.player = player;
this.playing = false;
this.initialized = false;
this.enabled = utils.is.url(player.config.ads.tagUrl);
this.enabled = utils.is.url(player.config.ads.tag);
// Check if a tag URL is provided.
if (!this.enabled) {
@ -122,7 +122,7 @@ class Ads {
// Request video ads
const request = new google.ima.AdsRequest();
request.adTagUrl = this.player.config.ads.tagUrl;
request.adTagUrl = this.player.config.ads.tag;
// Specify the linear and nonlinear slot sizes. This helps the SDK
// to select the correct creative if multiple are returned
@ -150,15 +150,15 @@ class Ads {
if (!start) {
window.clearInterval(this.countdownTimer);
this.elements.container.removeAttribute('data-badge-text');
return;
}
const update = () => {
const time = utils.formatTime(this.manager.getRemainingTime());
const text = this.player.config.i18n.adCountdown.replace('{countdown}', time);
this.elements.container.setAttribute('data-badge-text', text);
this.elements.container.setAttribute('data-badge-text', time);
};
this.countdownTimer = window.setInterval(update, 500);
this.countdownTimer = window.setInterval(update, 100);
}
/**
@ -296,7 +296,9 @@ 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
this.handleEventListeners('CONTENT_PAUSE_REQUESTED');
dispatchEvent('contentpause');
this.pauseContent();
break;
@ -307,8 +309,13 @@ class Ads {
// Fired when content should be resumed. This usually happens when an ad finishes
// or collapses
this.handleEventListeners('CONTENT_RESUME_REQUESTED');
dispatchEvent('contentresume');
this.pollCountdown();
this.resumeContent();
break;
case google.ima.AdEvent.Type.STARTED:
@ -321,9 +328,6 @@ class Ads {
case google.ima.AdEvent.Type.COMPLETE:
dispatchEvent('complete');
// End countdown
this.pollCountdown();
break;
case google.ima.AdEvent.Type.IMPRESSION:

8
src/sass/plugins/ads.scss
View File

@ -9,7 +9,7 @@
position: absolute;
right: 0;
top: 0;
z-index: 3; // Above the controls.
z-index: 3; // Above the controls
&::after {
background: rgba($plyr-color-gunmetal, 0.8);
@ -17,7 +17,7 @@
bottom: $plyr-control-spacing;
color: #fff;
content: attr(data-badge-text);
font-size: 10px;
font-size: 11px;
padding: 2px 6px;
pointer-events: none;
position: absolute;
@ -30,7 +30,7 @@
}
}
// Advertisement cue's for the progress bar.
// Advertisement cue's for the progress bar
.plyr__cues {
background: currentColor;
display: block;
@ -41,5 +41,5 @@
position: absolute;
top: 50%;
width: 3px;
z-index: 3; // Between progress and thumb.
z-index: 3; // Between progress and thumb
}