diff options
| author | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
| commit | 7c6d4666e99f1604c28c57bec12f16bd0fb7e79c (patch) | |
| tree | 2b5e3288defe5760694fe1096cc1d9c3490f3118 /src/js/defaults.js | |
| parent | 90c5735904354f5fde0dcdae9f8894fe9088739c (diff) | |
| parent | 76bb299c68a6b5cc72729771aca2f0d51078ebc5 (diff) | |
| download | plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.lz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.xz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.zip | |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# demo/dist/demo.css
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# src/js/captions.js
# src/js/plyr.js
Diffstat (limited to 'src/js/defaults.js')
| -rw-r--r-- | src/js/defaults.js | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/js/defaults.js b/src/js/defaults.js index 54c19f94..78371d68 100644 --- a/src/js/defaults.js +++ b/src/js/defaults.js @@ -60,7 +60,7 @@ const defaults = { // Sprite (for icons) loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/3.3.8/plyr.svg', + iconUrl: 'https://cdn.plyr.io/3.3.10/plyr.svg', // Blank video (used to prevent errors on source change) blankVideo: 'https://cdn.plyr.io/static/blank.mp4', @@ -119,7 +119,10 @@ const defaults = { // Captions settings captions: { active: false, - language: (navigator.language || navigator.userLanguage).split('-')[0], + language: 'auto', + // Listen to new tracks added after Plyr is initialized. + // This is needed for streaming captions, but may result in unselectable options + update: false, }, // Fullscreen settings @@ -191,6 +194,14 @@ const defaults = { disabled: 'Disabled', enabled: 'Enabled', advertisement: 'Ad', + qualityBadge: { + 2160: '4K', + 1440: 'HD', + 1080: 'HD', + 720: 'HD', + 576: 'SD', + 480: 'SD', + }, }, // URLs @@ -315,9 +326,8 @@ const defaults = { display: { currentTime: '.plyr__time--current', duration: '.plyr__time--duration', - buffer: '.plyr__progress--buffer', - played: '.plyr__progress--played', - loop: '.plyr__progress--loop', + buffer: '.plyr__progress__buffer', + loop: '.plyr__progress__loop', // Used later volume: '.plyr__volume--display', }, progress: '.plyr__progress', |