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

Merge branch 'beta' into fix/ads-blocked

Browse Source 
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	src/js/plugins/ads.js
#	src/js/plyr.js
This commit is contained in:
Sam Potts
2018-01-30 09:22:14 +11:00
parent afd695cb39 8f7a8940f3
commit 71efbe7a92
19 changed files with 112 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/plyr.js
View File

@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v3.0.0-beta.5
// plyr.js v3.0.0-beta.8
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================
@@ -309,12 +309,14 @@ class Plyr {
* Play the media, or play the advertisement (if they are not blocked)
*/
play() {
// TODO: Always return a promise?
if (this.ads.enabled && !this.ads.initialized && !this.ads.blocked) {
this.ads.play();
return;
return null;
}
this.media.play();
// Return the promise (for HTML5)
return this.media.play();
}
/**