diff --git a/js-plugins/ipad/flowplayer.ipad.js b/js-plugins/ipad/flowplayer.ipad.js index 921841a..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: @@ -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); @@ -925,7 +938,6 @@ $f.addPlugin("ipad", function(options) { api.style.cursor = 'pointer'; api.style.webkitUserDrag = 'none'; - api.type="video/mp4"; // if ( hasBuiltinControls ) // api.controls="controls";