From cb84fb27662552663e62b2d06f1370c48c9c216c Mon Sep 17 00:00:00 2001 From: Christian Ebert Date: Tue, 7 Oct 2014 17:59:21 +0100 Subject: [PATCH 1/3] ipad: do not set video type attribute Forcing it to video/mp4 does not make sense with HLS or audio. As this was never needed on iOS, we just omit the type attribute instead of implementing some unreliable detection mechanism based on filename suffix. --- js-plugins/ipad/flowplayer.ipad.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js-plugins/ipad/flowplayer.ipad.js b/js-plugins/ipad/flowplayer.ipad.js index 921841a..f820880 100644 --- a/js-plugins/ipad/flowplayer.ipad.js +++ b/js-plugins/ipad/flowplayer.ipad.js @@ -925,7 +925,6 @@ $f.addPlugin("ipad", function(options) { api.style.cursor = 'pointer'; api.style.webkitUserDrag = 'none'; - api.type="video/mp4"; // if ( hasBuiltinControls ) // api.controls="controls"; From 37a6e015cdd88f29175b6aa336ec9b7230c0a74f Mon Sep 17 00:00:00 2001 From: Christian Ebert Date: Tue, 7 Oct 2014 18:01:47 +0100 Subject: [PATCH 2/3] ipad: fixes for iOS 8 (#266) - remove href attribute from Flash container; if the container is an anchor, clicking on the wrapping anchor opens the link otherwise - do not try to auto play live videos, the player is stuck on the first image otherwise - still transitions well to a live stream in a playlist --- js-plugins/ipad/flowplayer.ipad.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/js-plugins/ipad/flowplayer.ipad.js b/js-plugins/ipad/flowplayer.ipad.js index f820880..495796d 100644 --- a/js-plugins/ipad/flowplayer.ipad.js +++ b/js-plugins/ipad/flowplayer.ipad.js @@ -360,13 +360,22 @@ $f.addPlugin("ipad", function(options) { $f.fireEvent(self.id(), 'onBegin', activeIndex); log("calling video.load()"); - video.load(); + if (! clip.live ) // iOS 8 chokes otherwise + video.load(); } // auto if ( autoPlay ) { log("calling video.play()"); - video.play(); + if ( clip.live ) { + // timeout required for iOS 8, live stream not recognized, + // only the current m3u8 segment list duration + setTimeout(function () { + video.play(); + }, 1); + } else { + video.play(); + } } } @@ -902,6 +911,10 @@ $f.addPlugin("ipad", function(options) { while(root.firstChild) root.removeChild(root.firstChild); + // do not follow video link - crucial for iOS 8 + if (root.hasAttribute("href")) + root.removeAttribute("href"); + var container = document.createElement('div'); var api = document.createElement('video'); container.appendChild(api); From 64b6684e12a1ddd3f56adb6d1460bc93ece23bd6 Mon Sep 17 00:00:00 2001 From: Christian Ebert Date: Wed, 8 Oct 2014 00:33:13 +0100 Subject: [PATCH 3/3] ipad: bump copyright year --- js-plugins/ipad/flowplayer.ipad.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js-plugins/ipad/flowplayer.ipad.js b/js-plugins/ipad/flowplayer.ipad.js index 495796d..1f14946 100644 --- a/js-plugins/ipad/flowplayer.ipad.js +++ b/js-plugins/ipad/flowplayer.ipad.js @@ -1,7 +1,7 @@ /*! * ipad.js The Flowplayer iOS fallback. * - * Copyright 2010-2013 Flowplayer Oy + * Copyright 2010-2014 Flowplayer Oy * By Thomas Dubois * * Released under the MIT License: