aboutsummaryrefslogtreecommitdiffstats
path: root/src/js/defaults.js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2018-05-31 23:43:40 +1000
committerSam Potts <sam@potts.es>2018-05-31 23:43:40 +1000
commita4caba120c76a19fa9424598de119c44776e386d (patch)
tree3d20818f19da4298838dd295105abc63088d2b48 /src/js/defaults.js
parent969a877a34e0cad1bca4bf17e9661ba6e73bcb99 (diff)
parentfb22a90d33ad991e1f6de22f201c3b49f54168c1 (diff)
downloadplyr-a4caba120c76a19fa9424598de119c44776e386d.tar.lz
plyr-a4caba120c76a19fa9424598de119c44776e386d.tar.xz
plyr-a4caba120c76a19fa9424598de119c44776e386d.zip
Merge branch 'master' of github.com:sampotts/plyr
# 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.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map
Diffstat (limited to 'src/js/defaults.js')
-rw-r--r--src/js/defaults.js18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/js/defaults.js b/src/js/defaults.js
index 34e077ee..16df8624 100644
--- a/src/js/defaults.js
+++ b/src/js/defaults.js
@@ -115,7 +115,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
@@ -187,6 +190,14 @@ const defaults = {
disabled: 'Disabled',
enabled: 'Enabled',
advertisement: 'Ad',
+ qualityBadge: {
+ 2160: '4K',
+ 1440: 'HD',
+ 1080: 'HD',
+ 720: 'HD',
+ 576: 'SD',
+ 480: 'SD',
+ },
},
// URLs
@@ -311,9 +322,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',