diff options
| author | Sam Potts <sam@potts.es> | 2018-05-31 23:43:40 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-05-31 23:43:40 +1000 |
| commit | a4caba120c76a19fa9424598de119c44776e386d (patch) | |
| tree | 3d20818f19da4298838dd295105abc63088d2b48 /src/js/ui.js | |
| parent | 969a877a34e0cad1bca4bf17e9661ba6e73bcb99 (diff) | |
| parent | fb22a90d33ad991e1f6de22f201c3b49f54168c1 (diff) | |
| download | plyr-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/ui.js')
| -rw-r--r-- | src/js/ui.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/js/ui.js b/src/js/ui.js index 3a8f2d05..d6ab0e59 100644 --- a/src/js/ui.js +++ b/src/js/ui.js @@ -55,8 +55,10 @@ const ui = { // Remove native controls ui.toggleNativeControls.call(this); - // Captions - captions.setup.call(this); + // Setup captions for HTML5 + if (this.isHTML5) { + captions.setup.call(this); + } // Reset volume this.volume = null; @@ -109,6 +111,12 @@ const ui = { if (this.poster && this.elements.poster && !this.elements.poster.style.backgroundImage) { ui.setPoster.call(this, this.poster); } + + // Manually set the duration if user has overridden it. + // The event listeners for it doesn't get called if preload is disabled (#701) + if (this.config.duration) { + controls.durationUpdate.call(this); + } }, // Setup aria attribute for play and iframe title |