diff options
| author | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
| commit | da943b384ca334cad66fd261cb9a0f924716da9d (patch) | |
| tree | 5aaac37b474a2708c7910eb536b9d96d4c0dcff3 /src/js/captions.js | |
| parent | 50a7c2fad6f0d9b03788fe57a855894eafcf5ef7 (diff) | |
| parent | ad63af5096e014785bd22eac24bc8030c0dc70d6 (diff) | |
| download | plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.lz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.xz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.zip | |
Merge branch 'develop' into css-variables
# Conflicts:
# demo/dist/demo.css
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.css
# dist/plyr.min.js.map
# dist/plyr.min.mjs.map
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs.map
# gulpfile.js
# src/sass/base.scss
# src/sass/components/control.scss
# src/sass/settings/colors.scss
# src/sass/settings/controls.scss
Diffstat (limited to 'src/js/captions.js')
| -rw-r--r-- | src/js/captions.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/js/captions.js b/src/js/captions.js index f7c24534..04da4651 100644 --- a/src/js/captions.js +++ b/src/js/captions.js @@ -133,7 +133,8 @@ const captions = { }); // Turn off native caption rendering to avoid double captions - Object.assign(track, { mode: 'hidden' }); + // eslint-disable-next-line no-param-reassign + track.mode = 'hidden'; // Add event listener for cue changes on.call(this, track, 'cuechange', () => captions.updateCues.call(this)); @@ -150,7 +151,11 @@ const captions = { toggleClass(this.elements.container, this.config.classNames.captions.enabled, !is.empty(tracks)); // Update available languages in list - if ((this.config.controls || []).includes('settings') && this.config.settings.includes('captions')) { + if ( + is.array(this.config.controls) && + this.config.controls.includes('settings') && + this.config.settings.includes('captions') + ) { controls.setCaptionsMenu.call(this); } }, |