From f398266206e10b945cccdacc7edc4b5eb3308442 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 7 Jun 2015 23:20:33 +1000 Subject: [PATCH] Chrome Canary Fix --- dist/plyr.js | 2 +- docs/error.html | 2 +- docs/index.html | 10 +++++----- gulpfile.js | 2 +- package.json | 2 +- readme.md | 8 ++++---- src/js/plyr.js | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dist/plyr.js b/dist/plyr.js index 192a7501..0ccfa6f0 100644 --- a/dist/plyr.js +++ b/dist/plyr.js @@ -1 +1 @@ -!function(e){"use strict";function t(){var e=["
","
","","","","0% played","","","0% buffered","","
",""];return a(F.controls,"restart")&&e.push(""),a(F.controls,"rewind")&&e.push(""),a(F.controls,"play")&&e.push("",""),a(F.controls,"fast-forward")&&e.push(""),a(F.controls,"current-time")&&e.push("","Current time","00:00",""),a(F.controls,"duration")&&e.push("","Duration","00:00",""),e.push("",""),a(F.controls,"mute")&&e.push("",""),a(F.controls,"volume")&&e.push("",""),a(F.controls,"captions")&&e.push("",""),a(F.controls,"fullscreen")&&e.push(""),e.push("","
"),e.join("")}function n(e,t){F.debug&&window.console&&console[t?"error":"log"](e)}function r(){var e,t,n,r=navigator.userAgent,s=navigator.appName,a=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10);return-1!==navigator.appVersion.indexOf("Windows NT")&&-1!==navigator.appVersion.indexOf("rv:11")?(s="IE",a="11;"):-1!==(t=r.indexOf("MSIE"))?(s="IE",a=r.substring(t+5)):-1!==(t=r.indexOf("Chrome"))?(s="Chrome",a=r.substring(t+7)):-1!==(t=r.indexOf("Safari"))?(s="Safari",a=r.substring(t+7),-1!==(t=r.indexOf("Version"))&&(a=r.substring(t+8))):-1!==(t=r.indexOf("Firefox"))?(s="Firefox",a=r.substring(t+8)):(e=r.lastIndexOf(" ")+1)<(t=r.lastIndexOf("/"))&&(s=r.substring(e,t),a=r.substring(t+1),s.toLowerCase()==s.toUpperCase()&&(s=navigator.appName)),-1!==(n=a.indexOf(";"))&&(a=a.substring(0,n)),-1!==(n=a.indexOf(" "))&&(a=a.substring(0,n)),o=parseInt(""+a,10),isNaN(o)&&(a=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10)),{name:s,version:o,ios:/(iPad|iPhone|iPod)/g.test(navigator.platform)}}function s(e,t){var n=e.media;if("video"==e.type)switch(t){case"video/webm":return!(!n.canPlayType||!n.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/no/,""));case"video/mp4":return!(!n.canPlayType||!n.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/,""));case"video/ogg":return!(!n.canPlayType||!n.canPlayType('video/ogg; codecs="theora"').replace(/no/,""))}else if("audio"==e.type)switch(t){case"audio/mpeg":return!(!n.canPlayType||!n.canPlayType("audio/mpeg;").replace(/no/,""));case"audio/ogg":return!(!n.canPlayType||!n.canPlayType('audio/ogg; codecs="vorbis"').replace(/no/,""));case"audio/wav":return!(!n.canPlayType||!n.canPlayType('audio/wav; codecs="1"').replace(/no/,""))}return!1}function a(e,t){return Array.prototype.indexOf&&-1!=e.indexOf(t)}function o(e,t,n){return e.replace(new RegExp(t.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),n)}function i(e,t){e.length||(e=[e]);for(var n=e.length-1;n>=0;n--){var r=n>0?t.cloneNode(!0):t,s=e[n],a=s.parentNode,o=s.nextSibling;r.appendChild(s),o?a.insertBefore(r,o):a.appendChild(r)}}function l(e){for(var t=e.parentNode;e.firstChild;)t.insertBefore(e.firstChild,e);t.removeChild(e)}function c(e){e.parentNode.removeChild(e)}function u(e,t){e.insertBefore(t,e.firstChild)}function p(e,t){for(var n in t)e.setAttribute(n,t[n])}function d(e,t,n){if(e)if(e.classList)e.classList[n?"add":"remove"](t);else{var r=(" "+e.className+" ").replace(/\s+/g," ").replace(" "+t+" ","");e.className=r+(n?" "+t:"")}}function f(e,t,n,r){var s=t.split(" ");if(e instanceof NodeList)for(var a=0;an;n++){if(e.prefix=t[n],"undefined"!=typeof document[e.prefix+"CancelFullScreen"]){e.supportsFullScreen=!0;break}if("undefined"!=typeof document.msExitFullscreen&&document.msFullscreenEnabled){e.prefix="ms",e.supportsFullScreen=!0;break}}return"webkit"===e.prefix&&navigator.userAgent.match(/Version\/[\d\.]+.*Safari/)&&(e.supportsFullScreen=!1),e.supportsFullScreen&&(e.fullScreenEventName="ms"==e.prefix?"MSFullscreenChange":e.prefix+"fullscreenchange",e.isFullScreen=function(e){switch("undefined"==typeof e&&(e=document),this.prefix){case"":return document.fullscreenElement==e;case"moz":return document.mozFullScreenElement==e;default:return document[this.prefix+"FullscreenElement"]==e}},e.requestFullScreen=function(e){return""===this.prefix?e.requestFullScreen():e[this.prefix+("ms"==this.prefix?"RequestFullscreen":"RequestFullScreen")]("webkit"===this.prefix?e.ALLOW_KEYBOARD_INPUT:null)},e.cancelFullScreen=function(){return""===this.prefix?document.cancelFullScreen():document[this.prefix+("ms"==this.prefix?"ExitFullscreen":"CancelFullScreen")]()},e.element=function(){return""===this.prefix?document.fullscreenElement:document[this.prefix+"FullscreenElement"]}),e}function x(){var e={supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}()};return e}function w(a){function f(e){if(!it.usingTextTracks&&"video"===it.type&&it.supported.full){for(it.subcount=0,e="number"==typeof e?e:it.media.currentTime;S(it.captions[it.subcount][0])it.captions.length-1){it.subcount=it.captions.length-1;break}it.media.currentTime.toFixed(1)>=w(it.captions[it.subcount][0])&&it.media.currentTime.toFixed(1)<=S(it.captions[it.subcount][0])?(it.currentCaption=it.captions[it.subcount][1],it.captionsContainer.innerHTML=it.currentCaption):it.captionsContainer.innerHTML=""}}function h(){it.buttons.captions&&(d(it.container,F.classes.captions.enabled,!0),F.captions.defaultActive&&(d(it.container,F.classes.captions.active,!0),it.buttons.captions.checked=!0))}function w(e){var t=[];return t=e.split(" --> "),C(t[0])}function S(e){var t=[];return t=e.split(" --> "),C(t[1])}function C(e){if(null===e||void 0===e)return 0;var t,n=[],r=[];return n=e.split(","),r=n[0].split(":"),t=Math.floor(60*r[0]*60)+Math.floor(60*r[1])+Math.floor(r[2])}function E(e){return it.container.querySelectorAll(e)}function A(e){return E(e)[0]}function N(){try{return window.self!==window.top}catch(e){return!0}}function P(){var e=F.html;if(n("Injecting custom controls."),e||(e=t()),e=o(e,"{seektime}",F.seekTime),e=o(e,"{id}",Math.floor(1e4*Math.random())),it.container.insertAdjacentHTML("beforeend",e),F.tooltips)for(var r=E(F.selectors.labels),s=r.length-1;s>=0;s--){var a=r[s];d(a,F.classes.hidden,!1),d(a,F.classes.tooltip,!0)}}function M(){try{return it.controls=A(F.selectors.controls),it.buttons={},it.buttons.seek=A(F.selectors.buttons.seek),it.buttons.play=A(F.selectors.buttons.play),it.buttons.pause=A(F.selectors.buttons.pause),it.buttons.restart=A(F.selectors.buttons.restart),it.buttons.rewind=A(F.selectors.buttons.rewind),it.buttons.forward=A(F.selectors.buttons.forward),it.buttons.fullscreen=A(F.selectors.buttons.fullscreen),it.buttons.mute=A(F.selectors.buttons.mute),it.buttons.captions=A(F.selectors.buttons.captions),it.checkboxes=E("[type='checkbox']"),it.progress={},it.progress.container=A(F.selectors.progress.container),it.progress.buffer={},it.progress.buffer.bar=A(F.selectors.progress.buffer),it.progress.buffer.text=it.progress.buffer.bar&&it.progress.buffer.bar.getElementsByTagName("span")[0],it.progress.played={},it.progress.played.bar=A(F.selectors.progress.played),it.progress.played.text=it.progress.played.bar&&it.progress.played.bar.getElementsByTagName("span")[0],it.volume=A(F.selectors.buttons.volume),it.duration=A(F.selectors.duration),it.currentTime=A(F.selectors.currentTime),it.seekTime=E(F.selectors.seekTime),!0}catch(e){return n("It looks like there's a problem with your controls html. Bailing.",!0),it.media.setAttribute("controls",""),!1}}function I(){if(it.buttons.play){var e=it.buttons.play.innerText||"Play";"undefined"!=typeof F.title&&F.title.length&&(e+=", "+F.title),it.buttons.play.setAttribute("aria-label",e)}}function L(){if(!it.media)return n("No audio or video element found!",!0),!1;if(it.supported.full&&(it.media.removeAttribute("controls"),d(it.container,F.classes[it.type],!0),d(it.container,F.classes.stopped,null===it.media.getAttribute("autoplay")),it.browser.ios&&d(it.container,"ios",!0),"video"===it.type)){var e=document.createElement("div");e.setAttribute("class",F.classes.videoWrapper),i(it.media,e),it.videoContainer=e}null!==it.media.getAttribute("autoplay")&&H()}function O(){if("video"===it.type){it.videoContainer.insertAdjacentHTML("afterbegin","
"),it.captionsContainer=A(F.selectors.captions),it.usingTextTracks=!1,it.media.textTracks&&(it.usingTextTracks=!0);for(var e,t="",r=it.media.childNodes,s=0;s=31||"Chrome"===it.browser.name&&43===it.browser.version||"Safari"===it.browser.name&&it.browser.version>=7)&&(n("Detected unsupported browser for HTML5 captions. Using fallback."),it.usingTextTracks=!1),it.usingTextTracks){n("TextTracks supported.");for(var i=0;i=7){n("Safari 7+ detected; removing track from DOM."),a=it.media.getElementsByTagName("track");for(var u=0;ut?t=0:t>it.media.duration&&(t=it.media.duration);try{it.media.currentTime=t.toFixed(1)}catch(r){}n("Seeking to "+it.media.currentTime+" seconds"),f(t)}function U(){d(it.container,F.classes.playing,!it.media.paused),d(it.container,F.classes.stopped,it.media.paused)}function W(e){var t=T.supportsFullScreen;e&&e.type===T.fullScreenEventName?it.isFullscreen=T.isFullScreen(it.container):t?(T.isFullScreen(it.container)?T.cancelFullScreen():T.requestFullScreen(it.container),it.isFullscreen=T.isFullScreen(it.container)):(it.isFullscreen=!it.isFullscreen,it.isFullscreen?(m(document,"keyup",z),document.body.style.overflow="hidden"):(y(document,"keyup",z),document.body.style.overflow="")),d(it.container,F.classes.fullscreen.active,it.isFullscreen),it.isFullscreen&&d(it.controls,F.classes.hover,!1)}function z(e){27===(e.which||e.charCode||e.keyCode)&&it.isFullscreen&&W()}function X(e){"undefined"==typeof e&&(e=F.storage.enabled&&x().supported?window.localStorage[F.storage.key]||F.volume:F.volume),n(e),e>10&&(e=10),0>e&&(e=0),it.media.volume=parseFloat(e/10),it.media.muted&&e>0&&_()}function _(e){"undefined"==typeof e&&(e=!it.media.muted),it.media.muted=e}function J(){var e=it.media.muted?0:10*it.media.volume;it.supported.full&&it.volume&&(it.volume.value=e),F.storage.enabled&&x().supported&&window.localStorage.setItem(F.storage.key,e),d(it.container,F.classes.muted,0===e),it.supported.full&&it.buttons.mute&&(it.buttons.mute.checked=0===e)}function $(e){it.supported.full&&it.buttons.captions&&("undefined"==typeof e&&(e=-1===it.container.className.indexOf(F.classes.captions.active),it.buttons.captions.checked=e),d(it.container,F.classes.captions.active,e))}function K(e){var t="waiting"===e.type;clearTimeout(it.loadingTimer),it.loadingTimer=setTimeout(function(){d(it.container,F.classes.loading,t)},t?250:0)}function Y(e){var t=it.progress.played.bar,n=it.progress.played.text,r=0;if(e)switch(e.type){case"timeupdate":case"seeking":r=g(it.media.currentTime,it.media.duration),"timeupdate"==e.type&&it.buttons.seek&&(it.buttons.seek.value=r);break;case"change":case"input":r=e.target.value;break;case"playing":case"progress":t=it.progress.buffer.bar,n=it.progress.buffer.text,r=function(){var e=it.media.buffered;return e.length?g(e.end(0),it.media.duration):0}()}t&&(t.value=r),n&&(n.innerHTML=r)}function G(e,t){if(t){it.secs=parseInt(e%60),it.mins=parseInt(e/60%60),it.hours=parseInt(e/60/60%60);var n=parseInt(it.media.duration/60/60%60)>0;it.secs=("0"+it.secs).slice(-2),it.mins=("0"+it.mins).slice(-2),t.innerHTML=(n?it.hours+":":"")+it.mins+":"+it.secs}}function Q(){var e=it.media.duration||0;!it.duration&&F.displayDuration&&it.media.paused&&G(e,it.currentTime),it.duration&&G(e,it.duration)}function Z(e){G(it.media.currentTime,it.currentTime),Y(e)}function et(){for(var e=it.media.querySelectorAll("source"),t=e.length-1;t>=0;t--)c(e[t]);it.media.removeAttribute("src")}function tt(e){if(e.src){var t=document.createElement("source");p(t,e),u(it.media,t)}}function nt(e){if(V(),D(),et(),"string"==typeof e)it.media.setAttribute("src",e);else if(e.constructor===Array)for(var t in e)tt(e[t]);it.supported.full&&(Z(),U()),it.media.load(),null!==it.media.getAttribute("autoplay")&&H()}function rt(e){"video"===it.type&&it.media.setAttribute("poster",e)}function st(){var e="IE"==it.browser.name?"change":"input";m(it.buttons.play,"click",function(){H(),setTimeout(function(){it.buttons.pause.focus()},100)}),m(it.buttons.pause,"click",function(){V(),setTimeout(function(){it.buttons.play.focus()},100)}),m(it.buttons.restart,"click",D),m(it.buttons.rewind,"click",R),m(it.buttons.forward,"click",j),m(it.buttons.seek,e,D),m(it.volume,e,function(){X(this.value)}),m(it.buttons.mute,"change",function(){_(this.checked)}),m(it.buttons.fullscreen,"click",W),T.supportsFullScreen&&m(document,T.fullScreenEventName,W),m(it.media,"timeupdate seeking",Z),m(it.media,"timeupdate",f),m(it.media,"loadedmetadata",Q),m(it.buttons.captions,"change",function(){$(this.checked)}),m(it.media,"ended",function(){"video"===it.type&&(it.captionsContainer.innerHTML=""),U()}),m(it.media,"progress",Y),m(it.media,"playing",Y),m(it.media,"volumechange",J),m(it.media,"play pause",U),m(it.media,"waiting canplay seeked",K),m(it.checkboxes,"keyup",b),"video"===it.type&&F.click&&m(it.videoContainer,"click",function(){it.media.paused?v(it.buttons.play,"click"):it.media.ended?(D(),v(it.buttons.play,"click")):v(it.buttons.pause,"click")}),F.fullscreen.hideControls&&m(it.controls,"mouseenter mouseleave",function(e){d(it.controls,F.classes.hover,"mouseenter"===e.type)})}function at(){if(!it.init)return null;it.container.setAttribute("class",F.selectors.container.replace(".","")),c(A(F.selectors.controls)),"video"===it.type&&(c(A(F.selectors.captions)),l(it.videoContainer)),it.media.setAttribute("controls","");var e=it.media.cloneNode(!0);it.media.parentNode.replaceChild(e,it.media),it.init=!1}function ot(){if(it.init)return null;if(T=k(),it.browser=r(),it.media=it.container.querySelectorAll("audio, video")[0],it.type=it.media.tagName.toLowerCase(),it.supported=e.supported(it.type),!it.supported.basic)return!1;if(n(it.browser.name+" "+it.browser.version),L(),it.supported.full){if(P(),!M())return!1;F.displayDuration&&Q(),I(),O(),X(),J(),q(),st()}it.init=!0}var it=this;return it.container=a,ot(),it.init?{media:it.media,play:H,pause:V,restart:D,rewind:R,forward:j,seek:D,source:nt,poster:rt,setVolume:X,togglePlay:B,toggleMute:_,toggleCaptions:$,toggleFullscreen:W,isFullscreen:function(){return it.isFullscreen||!1},support:function(e){return s(it,e)},destroy:at,restore:ot}:{}}var T,F,S={enabled:!0,debug:!1,seekTime:10,volume:5,click:!0,tooltips:!1,displayDuration:!0,selectors:{container:".player",controls:".player-controls",labels:"[data-player] .sr-only, label .sr-only",buttons:{seek:"[data-player='seek']",play:"[data-player='play']",pause:"[data-player='pause']",restart:"[data-player='restart']",rewind:"[data-player='rewind']",forward:"[data-player='fast-forward']",mute:"[data-player='mute']",volume:"[data-player='volume']",captions:"[data-player='captions']",fullscreen:"[data-player='fullscreen']"},progress:{container:".player-progress",buffer:".player-progress-buffer",played:".player-progress-played"},captions:".player-captions",currentTime:".player-current-time",duration:".player-duration"},classes:{video:"player-video",videoWrapper:"player-video-wrapper",audio:"player-audio",stopped:"stopped",playing:"playing",muted:"muted",loading:"loading",tooltip:"player-tooltip",hidden:"sr-only",hover:"hover",captions:{enabled:"captions-enabled",active:"captions-active"},fullscreen:{enabled:"fullscreen-enabled",active:"fullscreen-active",hideControls:"fullscreen-hide-controls"}},captions:{defaultActive:!1},fullscreen:{enabled:!0,fallback:!0,hideControls:!0},storage:{enabled:!0,key:"plyr_volume"},controls:["restart","rewind","play","fast-forward","current-time","duration","mute","volume","captions","fullscreen"],onSetup:function(){}};e.supported=function(e){var t,n,s=r(),a="IE"===s.name&&s.version<=9,o=/iPhone|iPod/i.test(navigator.userAgent),i=!!document.createElement("audio").canPlayType,l=!!document.createElement("video").canPlayType;switch(e){case"video":t=l,n=t&&!a&&!o;break;case"audio":t=i,n=t&&!a;break;default:t=i&&l,n=t&&!a}return{basic:t,full:n}},e.setup=function(t){if(F=h(S,t),!F.enabled||!e.supported().basic)return!1;for(var n=document.querySelectorAll(F.selectors.container),r=[],s=n.length-1;s>=0;s--){var a=n[s];if("undefined"==typeof a.plyr){var o=new w(a);a.plyr=Object.keys(o).length?o:!1,F.onSetup.apply(a.plyr)}r.push(a.plyr)}return r}}(this.plyr=this.plyr||{}); \ No newline at end of file +!function(e){"use strict";function t(){var e=["
","
","","","","0% played","","","0% buffered","","
",""];return a(F.controls,"restart")&&e.push(""),a(F.controls,"rewind")&&e.push(""),a(F.controls,"play")&&e.push("",""),a(F.controls,"fast-forward")&&e.push(""),a(F.controls,"current-time")&&e.push("","Current time","00:00",""),a(F.controls,"duration")&&e.push("","Duration","00:00",""),e.push("",""),a(F.controls,"mute")&&e.push("",""),a(F.controls,"volume")&&e.push("",""),a(F.controls,"captions")&&e.push("",""),a(F.controls,"fullscreen")&&e.push(""),e.push("","
"),e.join("")}function n(e,t){F.debug&&window.console&&console[t?"error":"log"](e)}function r(){var e,t,n,r=navigator.userAgent,s=navigator.appName,a=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10);return-1!==navigator.appVersion.indexOf("Windows NT")&&-1!==navigator.appVersion.indexOf("rv:11")?(s="IE",a="11;"):-1!==(t=r.indexOf("MSIE"))?(s="IE",a=r.substring(t+5)):-1!==(t=r.indexOf("Chrome"))?(s="Chrome",a=r.substring(t+7)):-1!==(t=r.indexOf("Safari"))?(s="Safari",a=r.substring(t+7),-1!==(t=r.indexOf("Version"))&&(a=r.substring(t+8))):-1!==(t=r.indexOf("Firefox"))?(s="Firefox",a=r.substring(t+8)):(e=r.lastIndexOf(" ")+1)<(t=r.lastIndexOf("/"))&&(s=r.substring(e,t),a=r.substring(t+1),s.toLowerCase()==s.toUpperCase()&&(s=navigator.appName)),-1!==(n=a.indexOf(";"))&&(a=a.substring(0,n)),-1!==(n=a.indexOf(" "))&&(a=a.substring(0,n)),o=parseInt(""+a,10),isNaN(o)&&(a=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10)),{name:s,version:o,ios:/(iPad|iPhone|iPod)/g.test(navigator.platform)}}function s(e,t){var n=e.media;if("video"==e.type)switch(t){case"video/webm":return!(!n.canPlayType||!n.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/no/,""));case"video/mp4":return!(!n.canPlayType||!n.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/,""));case"video/ogg":return!(!n.canPlayType||!n.canPlayType('video/ogg; codecs="theora"').replace(/no/,""))}else if("audio"==e.type)switch(t){case"audio/mpeg":return!(!n.canPlayType||!n.canPlayType("audio/mpeg;").replace(/no/,""));case"audio/ogg":return!(!n.canPlayType||!n.canPlayType('audio/ogg; codecs="vorbis"').replace(/no/,""));case"audio/wav":return!(!n.canPlayType||!n.canPlayType('audio/wav; codecs="1"').replace(/no/,""))}return!1}function a(e,t){return Array.prototype.indexOf&&-1!=e.indexOf(t)}function o(e,t,n){return e.replace(new RegExp(t.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),n)}function i(e,t){e.length||(e=[e]);for(var n=e.length-1;n>=0;n--){var r=n>0?t.cloneNode(!0):t,s=e[n],a=s.parentNode,o=s.nextSibling;r.appendChild(s),o?a.insertBefore(r,o):a.appendChild(r)}}function l(e){for(var t=e.parentNode;e.firstChild;)t.insertBefore(e.firstChild,e);t.removeChild(e)}function c(e){e.parentNode.removeChild(e)}function u(e,t){e.insertBefore(t,e.firstChild)}function p(e,t){for(var n in t)e.setAttribute(n,t[n])}function d(e,t,n){if(e)if(e.classList)e.classList[n?"add":"remove"](t);else{var r=(" "+e.className+" ").replace(/\s+/g," ").replace(" "+t+" ","");e.className=r+(n?" "+t:"")}}function f(e,t,n,r){var s=t.split(" ");if(e instanceof NodeList)for(var a=0;an;n++){if(e.prefix=t[n],"undefined"!=typeof document[e.prefix+"CancelFullScreen"]){e.supportsFullScreen=!0;break}if("undefined"!=typeof document.msExitFullscreen&&document.msFullscreenEnabled){e.prefix="ms",e.supportsFullScreen=!0;break}}return"webkit"===e.prefix&&navigator.userAgent.match(/Version\/[\d\.]+.*Safari/)&&(e.supportsFullScreen=!1),e.supportsFullScreen&&(e.fullScreenEventName="ms"==e.prefix?"MSFullscreenChange":e.prefix+"fullscreenchange",e.isFullScreen=function(e){switch("undefined"==typeof e&&(e=document),this.prefix){case"":return document.fullscreenElement==e;case"moz":return document.mozFullScreenElement==e;default:return document[this.prefix+"FullscreenElement"]==e}},e.requestFullScreen=function(e){return""===this.prefix?e.requestFullScreen():e[this.prefix+("ms"==this.prefix?"RequestFullscreen":"RequestFullScreen")]("webkit"===this.prefix?e.ALLOW_KEYBOARD_INPUT:null)},e.cancelFullScreen=function(){return""===this.prefix?document.cancelFullScreen():document[this.prefix+("ms"==this.prefix?"ExitFullscreen":"CancelFullScreen")]()},e.element=function(){return""===this.prefix?document.fullscreenElement:document[this.prefix+"FullscreenElement"]}),e}function x(){var e={supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}()};return e}function w(a){function f(e){if(!it.usingTextTracks&&"video"===it.type&&it.supported.full){for(it.subcount=0,e="number"==typeof e?e:it.media.currentTime;S(it.captions[it.subcount][0])it.captions.length-1){it.subcount=it.captions.length-1;break}it.media.currentTime.toFixed(1)>=w(it.captions[it.subcount][0])&&it.media.currentTime.toFixed(1)<=S(it.captions[it.subcount][0])?(it.currentCaption=it.captions[it.subcount][1],it.captionsContainer.innerHTML=it.currentCaption):it.captionsContainer.innerHTML=""}}function h(){it.buttons.captions&&(d(it.container,F.classes.captions.enabled,!0),F.captions.defaultActive&&(d(it.container,F.classes.captions.active,!0),it.buttons.captions.checked=!0))}function w(e){var t=[];return t=e.split(" --> "),C(t[0])}function S(e){var t=[];return t=e.split(" --> "),C(t[1])}function C(e){if(null===e||void 0===e)return 0;var t,n=[],r=[];return n=e.split(","),r=n[0].split(":"),t=Math.floor(60*r[0]*60)+Math.floor(60*r[1])+Math.floor(r[2])}function E(e){return it.container.querySelectorAll(e)}function A(e){return E(e)[0]}function N(){try{return window.self!==window.top}catch(e){return!0}}function P(){var e=F.html;if(n("Injecting custom controls."),e||(e=t()),e=o(e,"{seektime}",F.seekTime),e=o(e,"{id}",Math.floor(1e4*Math.random())),it.container.insertAdjacentHTML("beforeend",e),F.tooltips)for(var r=E(F.selectors.labels),s=r.length-1;s>=0;s--){var a=r[s];d(a,F.classes.hidden,!1),d(a,F.classes.tooltip,!0)}}function M(){try{return it.controls=A(F.selectors.controls),it.buttons={},it.buttons.seek=A(F.selectors.buttons.seek),it.buttons.play=A(F.selectors.buttons.play),it.buttons.pause=A(F.selectors.buttons.pause),it.buttons.restart=A(F.selectors.buttons.restart),it.buttons.rewind=A(F.selectors.buttons.rewind),it.buttons.forward=A(F.selectors.buttons.forward),it.buttons.fullscreen=A(F.selectors.buttons.fullscreen),it.buttons.mute=A(F.selectors.buttons.mute),it.buttons.captions=A(F.selectors.buttons.captions),it.checkboxes=E("[type='checkbox']"),it.progress={},it.progress.container=A(F.selectors.progress.container),it.progress.buffer={},it.progress.buffer.bar=A(F.selectors.progress.buffer),it.progress.buffer.text=it.progress.buffer.bar&&it.progress.buffer.bar.getElementsByTagName("span")[0],it.progress.played={},it.progress.played.bar=A(F.selectors.progress.played),it.progress.played.text=it.progress.played.bar&&it.progress.played.bar.getElementsByTagName("span")[0],it.volume=A(F.selectors.buttons.volume),it.duration=A(F.selectors.duration),it.currentTime=A(F.selectors.currentTime),it.seekTime=E(F.selectors.seekTime),!0}catch(e){return n("It looks like there's a problem with your controls html. Bailing.",!0),it.media.setAttribute("controls",""),!1}}function I(){if(it.buttons.play){var e=it.buttons.play.innerText||"Play";"undefined"!=typeof F.title&&F.title.length&&(e+=", "+F.title),it.buttons.play.setAttribute("aria-label",e)}}function L(){if(!it.media)return n("No audio or video element found!",!0),!1;if(it.supported.full&&(it.media.removeAttribute("controls"),d(it.container,F.classes[it.type],!0),d(it.container,F.classes.stopped,null===it.media.getAttribute("autoplay")),it.browser.ios&&d(it.container,"ios",!0),"video"===it.type)){var e=document.createElement("div");e.setAttribute("class",F.classes.videoWrapper),i(it.media,e),it.videoContainer=e}null!==it.media.getAttribute("autoplay")&&H()}function O(){if("video"===it.type){it.videoContainer.insertAdjacentHTML("afterbegin","
"),it.captionsContainer=A(F.selectors.captions),it.usingTextTracks=!1,it.media.textTracks&&(it.usingTextTracks=!0);for(var e,t="",r=it.media.childNodes,s=0;s=31||"Chrome"===it.browser.name&&it.browser.version>=43||"Safari"===it.browser.name&&it.browser.version>=7)&&(n("Detected unsupported browser for HTML5 captions. Using fallback."),it.usingTextTracks=!1),it.usingTextTracks){n("TextTracks supported.");for(var i=0;i=7){n("Safari 7+ detected; removing track from DOM."),a=it.media.getElementsByTagName("track");for(var u=0;ut?t=0:t>it.media.duration&&(t=it.media.duration);try{it.media.currentTime=t.toFixed(1)}catch(r){}n("Seeking to "+it.media.currentTime+" seconds"),f(t)}function U(){d(it.container,F.classes.playing,!it.media.paused),d(it.container,F.classes.stopped,it.media.paused)}function W(e){var t=T.supportsFullScreen;e&&e.type===T.fullScreenEventName?it.isFullscreen=T.isFullScreen(it.container):t?(T.isFullScreen(it.container)?T.cancelFullScreen():T.requestFullScreen(it.container),it.isFullscreen=T.isFullScreen(it.container)):(it.isFullscreen=!it.isFullscreen,it.isFullscreen?(m(document,"keyup",z),document.body.style.overflow="hidden"):(y(document,"keyup",z),document.body.style.overflow="")),d(it.container,F.classes.fullscreen.active,it.isFullscreen),it.isFullscreen&&d(it.controls,F.classes.hover,!1)}function z(e){27===(e.which||e.charCode||e.keyCode)&&it.isFullscreen&&W()}function X(e){"undefined"==typeof e&&(e=F.storage.enabled&&x().supported?window.localStorage[F.storage.key]||F.volume:F.volume),n(e),e>10&&(e=10),0>e&&(e=0),it.media.volume=parseFloat(e/10),it.media.muted&&e>0&&_()}function _(e){"undefined"==typeof e&&(e=!it.media.muted),it.media.muted=e}function J(){var e=it.media.muted?0:10*it.media.volume;it.supported.full&&it.volume&&(it.volume.value=e),F.storage.enabled&&x().supported&&window.localStorage.setItem(F.storage.key,e),d(it.container,F.classes.muted,0===e),it.supported.full&&it.buttons.mute&&(it.buttons.mute.checked=0===e)}function $(e){it.supported.full&&it.buttons.captions&&("undefined"==typeof e&&(e=-1===it.container.className.indexOf(F.classes.captions.active),it.buttons.captions.checked=e),d(it.container,F.classes.captions.active,e))}function K(e){var t="waiting"===e.type;clearTimeout(it.loadingTimer),it.loadingTimer=setTimeout(function(){d(it.container,F.classes.loading,t)},t?250:0)}function Y(e){var t=it.progress.played.bar,n=it.progress.played.text,r=0;if(e)switch(e.type){case"timeupdate":case"seeking":r=g(it.media.currentTime,it.media.duration),"timeupdate"==e.type&&it.buttons.seek&&(it.buttons.seek.value=r);break;case"change":case"input":r=e.target.value;break;case"playing":case"progress":t=it.progress.buffer.bar,n=it.progress.buffer.text,r=function(){var e=it.media.buffered;return e.length?g(e.end(0),it.media.duration):0}()}t&&(t.value=r),n&&(n.innerHTML=r)}function G(e,t){if(t){it.secs=parseInt(e%60),it.mins=parseInt(e/60%60),it.hours=parseInt(e/60/60%60);var n=parseInt(it.media.duration/60/60%60)>0;it.secs=("0"+it.secs).slice(-2),it.mins=("0"+it.mins).slice(-2),t.innerHTML=(n?it.hours+":":"")+it.mins+":"+it.secs}}function Q(){var e=it.media.duration||0;!it.duration&&F.displayDuration&&it.media.paused&&G(e,it.currentTime),it.duration&&G(e,it.duration)}function Z(e){G(it.media.currentTime,it.currentTime),Y(e)}function et(){for(var e=it.media.querySelectorAll("source"),t=e.length-1;t>=0;t--)c(e[t]);it.media.removeAttribute("src")}function tt(e){if(e.src){var t=document.createElement("source");p(t,e),u(it.media,t)}}function nt(e){if(V(),D(),et(),"string"==typeof e)it.media.setAttribute("src",e);else if(e.constructor===Array)for(var t in e)tt(e[t]);it.supported.full&&(Z(),U()),it.media.load(),null!==it.media.getAttribute("autoplay")&&H()}function rt(e){"video"===it.type&&it.media.setAttribute("poster",e)}function st(){var e="IE"==it.browser.name?"change":"input";m(it.buttons.play,"click",function(){H(),setTimeout(function(){it.buttons.pause.focus()},100)}),m(it.buttons.pause,"click",function(){V(),setTimeout(function(){it.buttons.play.focus()},100)}),m(it.buttons.restart,"click",D),m(it.buttons.rewind,"click",R),m(it.buttons.forward,"click",j),m(it.buttons.seek,e,D),m(it.volume,e,function(){X(this.value)}),m(it.buttons.mute,"change",function(){_(this.checked)}),m(it.buttons.fullscreen,"click",W),T.supportsFullScreen&&m(document,T.fullScreenEventName,W),m(it.media,"timeupdate seeking",Z),m(it.media,"timeupdate",f),m(it.media,"loadedmetadata",Q),m(it.buttons.captions,"change",function(){$(this.checked)}),m(it.media,"ended",function(){"video"===it.type&&(it.captionsContainer.innerHTML=""),U()}),m(it.media,"progress",Y),m(it.media,"playing",Y),m(it.media,"volumechange",J),m(it.media,"play pause",U),m(it.media,"waiting canplay seeked",K),m(it.checkboxes,"keyup",b),"video"===it.type&&F.click&&m(it.videoContainer,"click",function(){it.media.paused?v(it.buttons.play,"click"):it.media.ended?(D(),v(it.buttons.play,"click")):v(it.buttons.pause,"click")}),F.fullscreen.hideControls&&m(it.controls,"mouseenter mouseleave",function(e){d(it.controls,F.classes.hover,"mouseenter"===e.type)})}function at(){if(!it.init)return null;it.container.setAttribute("class",F.selectors.container.replace(".","")),c(A(F.selectors.controls)),"video"===it.type&&(c(A(F.selectors.captions)),l(it.videoContainer)),it.media.setAttribute("controls","");var e=it.media.cloneNode(!0);it.media.parentNode.replaceChild(e,it.media),it.init=!1}function ot(){if(it.init)return null;if(T=k(),it.browser=r(),it.media=it.container.querySelectorAll("audio, video")[0],it.type=it.media.tagName.toLowerCase(),it.supported=e.supported(it.type),!it.supported.basic)return!1;if(n(it.browser.name+" "+it.browser.version),L(),it.supported.full){if(P(),!M())return!1;F.displayDuration&&Q(),I(),O(),X(),J(),q(),st()}it.init=!0}var it=this;return it.container=a,ot(),it.init?{media:it.media,play:H,pause:V,restart:D,rewind:R,forward:j,seek:D,source:nt,poster:rt,setVolume:X,togglePlay:B,toggleMute:_,toggleCaptions:$,toggleFullscreen:W,isFullscreen:function(){return it.isFullscreen||!1},support:function(e){return s(it,e)},destroy:at,restore:ot}:{}}var T,F,S={enabled:!0,debug:!1,seekTime:10,volume:5,click:!0,tooltips:!1,displayDuration:!0,selectors:{container:".player",controls:".player-controls",labels:"[data-player] .sr-only, label .sr-only",buttons:{seek:"[data-player='seek']",play:"[data-player='play']",pause:"[data-player='pause']",restart:"[data-player='restart']",rewind:"[data-player='rewind']",forward:"[data-player='fast-forward']",mute:"[data-player='mute']",volume:"[data-player='volume']",captions:"[data-player='captions']",fullscreen:"[data-player='fullscreen']"},progress:{container:".player-progress",buffer:".player-progress-buffer",played:".player-progress-played"},captions:".player-captions",currentTime:".player-current-time",duration:".player-duration"},classes:{video:"player-video",videoWrapper:"player-video-wrapper",audio:"player-audio",stopped:"stopped",playing:"playing",muted:"muted",loading:"loading",tooltip:"player-tooltip",hidden:"sr-only",hover:"hover",captions:{enabled:"captions-enabled",active:"captions-active"},fullscreen:{enabled:"fullscreen-enabled",active:"fullscreen-active",hideControls:"fullscreen-hide-controls"}},captions:{defaultActive:!1},fullscreen:{enabled:!0,fallback:!0,hideControls:!0},storage:{enabled:!0,key:"plyr_volume"},controls:["restart","rewind","play","fast-forward","current-time","duration","mute","volume","captions","fullscreen"],onSetup:function(){}};e.supported=function(e){var t,n,s=r(),a="IE"===s.name&&s.version<=9,o=/iPhone|iPod/i.test(navigator.userAgent),i=!!document.createElement("audio").canPlayType,l=!!document.createElement("video").canPlayType;switch(e){case"video":t=l,n=t&&!a&&!o;break;case"audio":t=i,n=t&&!a;break;default:t=i&&l,n=t&&!a}return{basic:t,full:n}},e.setup=function(t){if(F=h(S,t),!F.enabled||!e.supported().basic)return!1;for(var n=document.querySelectorAll(F.selectors.container),r=[],s=n.length-1;s>=0;s--){var a=n[s];if("undefined"==typeof a.plyr){var o=new w(a);a.plyr=Object.keys(o).length?o:!1,F.onSetup.apply(a.plyr)}r.push(a.plyr)}return r}}(this.plyr=this.plyr||{}); \ No newline at end of file diff --git a/docs/error.html b/docs/error.html index 27bbef7f..65fc0d69 100644 --- a/docs/error.html +++ b/docs/error.html @@ -6,7 +6,7 @@ - +
diff --git a/docs/index.html b/docs/index.html index 7d1404b1..bddab725 100644 --- a/docs/index.html +++ b/docs/index.html @@ -8,10 +8,10 @@ - + - +
@@ -88,13 +88,13 @@ b.insertBefore(c, b.childNodes[0]); } } - })(document, "https://cdn.plyr.io/1.1.11/sprite.svg"); + })(document, "https://cdn.plyr.io/1.1.12/sprite.svg"); - + - + diff --git a/gulpfile.js b/gulpfile.js index a8724dfc..96e13368 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -272,5 +272,5 @@ gulp.task("open", function () { // Do everything gulp.task("publish", function () { - run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs", "open"); + run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs"); }); \ No newline at end of file diff --git a/package.json b/package.json index f67659f0..c23c8ccd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plyr", - "version": "1.1.11", + "version": "1.1.12", "description": "A simple HTML5 media player using custom controls", "homepage": "http://plyr.io", "main": "gulpfile.js", diff --git a/readme.md b/readme.md index 515026f0..222df6c6 100644 --- a/readme.md +++ b/readme.md @@ -37,7 +37,7 @@ If you have any cool ideas or features, please let me know by [creating an issue Check `docs/index.html` and `docs/dist/docs.js` for an example setup. -**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.11/plyr.js` to `https://cdn.plyr.io/1.1.11/plyr.js` +**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.12/plyr.js` to `https://cdn.plyr.io/1.1.12/plyr.js` ### Bower If bower is your thang, you can grab Plyr using: @@ -57,11 +57,11 @@ More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub] If you want to use our CDN, you can use the following: ```html - - + + ``` -You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.11/sprite.svg`. +You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.12/sprite.svg`. ### CSS If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. diff --git a/src/js/plyr.js b/src/js/plyr.js index 757bae40..abec626d 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -905,7 +905,7 @@ if ((player.browser.name === "IE" && player.browser.version === 10) || (player.browser.name === "IE" && player.browser.version === 11) || (player.browser.name === "Firefox" && player.browser.version >= 31) || - (player.browser.name === "Chrome" && player.browser.version === 43) || + (player.browser.name === "Chrome" && player.browser.version >= 43) || (player.browser.name === "Safari" && player.browser.version >= 7)) { // Debugging _log("Detected unsupported browser for HTML5 captions. Using fallback.");