From d959ced03c715461ce41d88083d2d919d5b4e751 Mon Sep 17 00:00:00 2001 From: Chris Lansing Date: Fri, 15 Dec 2017 15:40:29 -0500 Subject: [PATCH 1/2] Do not load hls.js on iOS --- src/players/FilePlayer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/players/FilePlayer.js b/src/players/FilePlayer.js index cb5b7679..2fea573c 100644 --- a/src/players/FilePlayer.js +++ b/src/players/FilePlayer.js @@ -80,7 +80,8 @@ export default class FilePlayer extends Component { return AUDIO_EXTENSIONS.test(props.url) || props.config.file.forceAudio } shouldUseHLS (url) { - return HLS_EXTENSIONS.test(url) || this.props.config.file.forceHLS + const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + return (HLS_EXTENSIONS.test(url) && !iOS) || this.props.config.file.forceHLS } shouldUseDASH (url) { return DASH_EXTENSIONS.test(url) || this.props.config.file.forceDASH From 240a9d5f27043394557494efc9b7c49219fee622 Mon Sep 17 00:00:00 2001 From: Chris Lansing Date: Mon, 18 Dec 2017 11:22:46 -0500 Subject: [PATCH 2/2] lint - extra semicolon --- src/players/FilePlayer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/players/FilePlayer.js b/src/players/FilePlayer.js index 2fea573c..c405f650 100644 --- a/src/players/FilePlayer.js +++ b/src/players/FilePlayer.js @@ -80,7 +80,7 @@ export default class FilePlayer extends Component { return AUDIO_EXTENSIONS.test(props.url) || props.config.file.forceAudio } shouldUseHLS (url) { - const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream return (HLS_EXTENSIONS.test(url) && !iOS) || this.props.config.file.forceHLS } shouldUseDASH (url) {