diff options
| author | Sam Potts <sam@potts.es> | 2018-04-14 14:58:09 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-04-14 14:58:09 +1000 |
| commit | 3061a701d57ab04a3b48ebe5174e9c9bef8d6d7d (patch) | |
| tree | 37525fd0fd0fcdc00ede630d9c4a17091eb0d45d /src | |
| parent | e45109e1d70b84375db789b69baa80d41e76ad3f (diff) | |
| download | plyr-3061a701d57ab04a3b48ebe5174e9c9bef8d6d7d.tar.lz plyr-3061a701d57ab04a3b48ebe5174e9c9bef8d6d7d.tar.xz plyr-3061a701d57ab04a3b48ebe5174e9c9bef8d6d7d.zip | |
PR merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/defaults.js | 2 | ||||
| -rw-r--r-- | src/js/listeners.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/js/defaults.js b/src/js/defaults.js index 8e6b9bd5..ff4316a9 100644 --- a/src/js/defaults.js +++ b/src/js/defaults.js @@ -115,7 +115,7 @@ const defaults = { // Captions settings captions: { active: false, - language: window.navigator.language ? window.navigator.language.split('-')[0] : 'en', + language: (navigator.language || navigator.userLanguage).split('-')[0], }, // Fullscreen settings diff --git a/src/js/listeners.js b/src/js/listeners.js index be7a53ef..c02e3388 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -293,6 +293,10 @@ class Listeners { // If autoplay, then load advertisement if required // TODO: Show some sort of loading state while the ad manager loads else there's a delay before ad shows utils.on(this.player.media, 'playing', () => { + if (!this.player.ads) { + return; + } + // If ads are enabled, wait for them first if (this.player.ads.enabled && !this.player.ads.initialized) { // Wait for manager response |