diff --git a/changelog.md b/changelog.md index f81bf982..318963bc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,32 @@ # Changelog +## v1.1.13 +- Added icon prefix option for when using default controls + +## v1.1.13 +- Logic tweaks for hiding controls in fullscreen + +## v1.1.12 +- Bug fix for Chrome Canary + +## v1.1.11 +- Bug fix + +## v1.1.10 +- Bug fix + +## v1.1.9 +- Bug fix for 1.1.8 + +## v1.1.8 +- setVolume API method improvements (Fixes #83) + +## v1.1.7 +- Restore classname on destroy() + +## v1.1.6 +- New API methods (fixes #77), Fix for non strict mode (fixes #78) + ## v1.1.5 - Fix for incorrect `isFullscreen()` return value in Mozilla (Fixes #38) diff --git a/dist/plyr.js b/dist/plyr.js index daabb420..05ceb87a 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 h(e){if(!lt.usingTextTracks&&"video"===lt.type&<.supported.full){for(lt.subcount=0,e="number"==typeof e?e:lt.media.currentTime;C(lt.captions[lt.subcount][0])lt.captions.length-1){lt.subcount=lt.captions.length-1;break}lt.media.currentTime.toFixed(1)>=S(lt.captions[lt.subcount][0])&<.media.currentTime.toFixed(1)<=C(lt.captions[lt.subcount][0])?(lt.currentCaption=lt.captions[lt.subcount][1],lt.captionsContainer.innerHTML=lt.currentCaption):lt.captionsContainer.innerHTML=""}}function w(){lt.buttons.captions&&(d(lt.container,F.classes.captions.enabled,!0),F.captions.defaultActive&&(d(lt.container,F.classes.captions.active,!0),lt.buttons.captions.checked=!0))}function S(e){var t=[];return t=e.split(" --> "),E(t[0])}function C(e){var t=[];return t=e.split(" --> "),E(t[1])}function E(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 A(e){return lt.container.querySelectorAll(e)}function N(e){return A(e)[0]}function P(){try{return window.self!==window.top}catch(e){return!0}}function M(){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())),lt.container.insertAdjacentHTML("beforeend",e),F.tooltips)for(var r=A(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 L(){try{return lt.controls=N(F.selectors.controls),lt.buttons={},lt.buttons.seek=N(F.selectors.buttons.seek),lt.buttons.play=N(F.selectors.buttons.play),lt.buttons.pause=N(F.selectors.buttons.pause),lt.buttons.restart=N(F.selectors.buttons.restart),lt.buttons.rewind=N(F.selectors.buttons.rewind),lt.buttons.forward=N(F.selectors.buttons.forward),lt.buttons.fullscreen=N(F.selectors.buttons.fullscreen),lt.buttons.mute=N(F.selectors.buttons.mute),lt.buttons.captions=N(F.selectors.buttons.captions),lt.checkboxes=A("[type='checkbox']"),lt.progress={},lt.progress.container=N(F.selectors.progress.container),lt.progress.buffer={},lt.progress.buffer.bar=N(F.selectors.progress.buffer),lt.progress.buffer.text=lt.progress.buffer.bar&<.progress.buffer.bar.getElementsByTagName("span")[0],lt.progress.played={},lt.progress.played.bar=N(F.selectors.progress.played),lt.progress.played.text=lt.progress.played.bar&<.progress.played.bar.getElementsByTagName("span")[0],lt.volume=N(F.selectors.buttons.volume),lt.duration=N(F.selectors.duration),lt.currentTime=N(F.selectors.currentTime),lt.seekTime=A(F.selectors.seekTime),!0}catch(e){return n("It looks like there's a problem with your controls html. Bailing.",!0),lt.media.setAttribute("controls",""),!1}}function I(){if(lt.buttons.play){var e=lt.buttons.play.innerText||"Play";"undefined"!=typeof F.title&&F.title.length&&(e+=", "+F.title),lt.buttons.play.setAttribute("aria-label",e)}}function O(){if(!lt.media)return n("No audio or video element found!",!0),!1;if(lt.supported.full&&(lt.media.removeAttribute("controls"),d(lt.container,F.classes[lt.type],!0),d(lt.container,F.classes.stopped,null===lt.media.getAttribute("autoplay")),lt.browser.ios&&d(lt.container,"ios",!0),"video"===lt.type)){var e=document.createElement("div");e.setAttribute("class",F.classes.videoWrapper),i(lt.media,e),lt.videoContainer=e}null!==lt.media.getAttribute("autoplay")&&V()}function q(){if("video"===lt.type){lt.videoContainer.insertAdjacentHTML("afterbegin","
"),lt.captionsContainer=N(F.selectors.captions),lt.usingTextTracks=!1,lt.media.textTracks&&(lt.usingTextTracks=!0);for(var e,t="",r=lt.media.childNodes,s=0;s=10||"Firefox"===lt.browser.name&<.browser.version>=31||"Chrome"===lt.browser.name&<.browser.version>=43||"Safari"===lt.browser.name&<.browser.version>=7)&&(n("Detected unsupported browser for HTML5 captions. Using fallback."),lt.usingTextTracks=!1),lt.usingTextTracks){n("TextTracks supported.");for(var i=0;i=7){n("Safari 7+ detected; removing track from DOM."),a=lt.media.getElementsByTagName("track");for(var u=0;ut?t=0:t>lt.media.duration&&(t=lt.media.duration);try{lt.media.currentTime=t.toFixed(1)}catch(r){}n("Seeking to "+lt.media.currentTime+" seconds"),h(t)}function W(){d(lt.container,F.classes.playing,!lt.media.paused),d(lt.container,F.classes.stopped,lt.media.paused)}function z(e){function t(){d(lt.controls,F.classes.hover,!0),window.clearTimeout(s),a||(s=window.setTimeout(function(){d(lt.controls,F.classes.hover,!1)},2e3))}function n(e){a="mouseenter"===e.type}var r=T.supportsFullScreen;e&&e.type===T.fullScreenEventName?lt.isFullscreen=T.isFullScreen(lt.container):r?(T.isFullScreen(lt.container)?T.cancelFullScreen():T.requestFullScreen(lt.container),lt.isFullscreen=T.isFullScreen(lt.container)):(lt.isFullscreen=!lt.isFullscreen,lt.isFullscreen?(m(document,"keyup",X),document.body.style.overflow="hidden"):(y(document,"keyup",X),document.body.style.overflow="")),d(lt.container,F.classes.fullscreen.active,lt.isFullscreen);var s,a=!1;F.fullscreen.hideControls&&(d(lt.controls,F.classes.hover,!1),f(lt.controls,"mouseenter mouseleave",n,lt.isFullscreen),f(lt.container,"mousemove",t,lt.isFullscreen))}function X(e){27===(e.which||e.charCode||e.keyCode)&<.isFullscreen&&z()}function _(e){"undefined"==typeof e&&(e=F.storage.enabled&&x().supported?window.localStorage[F.storage.key]||F.volume:F.volume),e>10&&(e=10),0>e&&(e=0),lt.media.volume=parseFloat(e/10),lt.media.muted&&e>0&&J()}function J(e){"undefined"==typeof e&&(e=!lt.media.muted),lt.media.muted=e}function $(){var e=lt.media.muted?0:10*lt.media.volume;lt.supported.full&<.volume&&(lt.volume.value=e),F.storage.enabled&&x().supported&&window.localStorage.setItem(F.storage.key,e),d(lt.container,F.classes.muted,0===e),lt.supported.full&<.buttons.mute&&(lt.buttons.mute.checked=0===e)}function K(e){lt.supported.full&<.buttons.captions&&("undefined"==typeof e&&(e=-1===lt.container.className.indexOf(F.classes.captions.active),lt.buttons.captions.checked=e),d(lt.container,F.classes.captions.active,e))}function Y(e){var t="waiting"===e.type;clearTimeout(lt.loadingTimer),lt.loadingTimer=setTimeout(function(){d(lt.container,F.classes.loading,t)},t?250:0)}function G(e){var t=lt.progress.played.bar,n=lt.progress.played.text,r=0;if(e)switch(e.type){case"timeupdate":case"seeking":r=g(lt.media.currentTime,lt.media.duration),"timeupdate"==e.type&<.buttons.seek&&(lt.buttons.seek.value=r);break;case"change":case"input":r=e.target.value;break;case"playing":case"progress":t=lt.progress.buffer.bar,n=lt.progress.buffer.text,r=function(){var e=lt.media.buffered;return e.length?g(e.end(0),lt.media.duration):0}()}t&&(t.value=r),n&&(n.innerHTML=r)}function Q(e,t){if(t){lt.secs=parseInt(e%60),lt.mins=parseInt(e/60%60),lt.hours=parseInt(e/60/60%60);var n=parseInt(lt.media.duration/60/60%60)>0;lt.secs=("0"+lt.secs).slice(-2),lt.mins=("0"+lt.mins).slice(-2),t.innerHTML=(n?lt.hours+":":"")+lt.mins+":"+lt.secs}}function Z(){var e=lt.media.duration||0;!lt.duration&&F.displayDuration&<.media.paused&&Q(e,lt.currentTime),lt.duration&&Q(e,lt.duration)}function et(e){Q(lt.media.currentTime,lt.currentTime),G(e)}function tt(){for(var e=lt.media.querySelectorAll("source"),t=e.length-1;t>=0;t--)c(e[t]);lt.media.removeAttribute("src")}function nt(e){if(e.src){var t=document.createElement("source");p(t,e),u(lt.media,t)}}function rt(e){if(B(),U(),tt(),"string"==typeof e)lt.media.setAttribute("src",e);else if(e.constructor===Array)for(var t in e)nt(e[t]);lt.supported.full&&(et(),W()),lt.media.load(),null!==lt.media.getAttribute("autoplay")&&V()}function st(e){"video"===lt.type&<.media.setAttribute("poster",e)}function at(){var e="IE"==lt.browser.name?"change":"input";m(lt.buttons.play,"click",function(){V(),setTimeout(function(){lt.buttons.pause.focus()},100)}),m(lt.buttons.pause,"click",function(){B(),setTimeout(function(){lt.buttons.play.focus()},100)}),m(lt.buttons.restart,"click",U),m(lt.buttons.rewind,"click",j),m(lt.buttons.forward,"click",D),m(lt.buttons.seek,e,U),m(lt.volume,e,function(){_(this.value)}),m(lt.buttons.mute,"change",function(){J(this.checked)}),m(lt.buttons.fullscreen,"click",z),T.supportsFullScreen&&m(document,T.fullScreenEventName,z),m(lt.media,"timeupdate seeking",et),m(lt.media,"timeupdate",h),m(lt.media,"loadedmetadata",Z),m(lt.buttons.captions,"change",function(){K(this.checked)}),m(lt.media,"ended",function(){"video"===lt.type&&(lt.captionsContainer.innerHTML=""),W()}),m(lt.media,"progress",G),m(lt.media,"playing",G),m(lt.media,"volumechange",$),m(lt.media,"play pause",W),m(lt.media,"waiting canplay seeked",Y),m(lt.checkboxes,"keyup",b),"video"===lt.type&&F.click&&m(lt.videoContainer,"click",function(){lt.media.paused?v(lt.buttons.play,"click"):lt.media.ended?(U(),v(lt.buttons.play,"click")):v(lt.buttons.pause,"click")})}function ot(){if(!lt.init)return null;lt.container.setAttribute("class",F.selectors.container.replace(".","")),c(N(F.selectors.controls)),"video"===lt.type&&(c(N(F.selectors.captions)),l(lt.videoContainer)),lt.media.setAttribute("controls","");var e=lt.media.cloneNode(!0);lt.media.parentNode.replaceChild(e,lt.media),lt.init=!1}function it(){if(lt.init)return null;if(T=k(),lt.browser=r(),lt.media=lt.container.querySelectorAll("audio, video")[0],lt.type=lt.media.tagName.toLowerCase(),lt.supported=e.supported(lt.type),!lt.supported.basic)return!1;if(n(lt.browser.name+" "+lt.browser.version),O(),lt.supported.full){if(M(),!L())return!1;F.displayDuration&&Z(),I(),q(),_(),$(),H(),at()}lt.init=!0}var lt=this;return lt.container=a,it(),lt.init?{media:lt.media,play:V,pause:B,restart:U,rewind:j,forward:D,seek:U,source:rt,poster:st,setVolume:_,togglePlay:R,toggleMute:J,toggleCaptions:K,toggleFullscreen:z,isFullscreen:function(){return lt.isFullscreen||!1},support:function(e){return s(lt,e)},destroy:ot,restore:it}:{}}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 h(e){if(!lt.usingTextTracks&&"video"===lt.type&<.supported.full){for(lt.subcount=0,e="number"==typeof e?e:lt.media.currentTime;C(lt.captions[lt.subcount][0])lt.captions.length-1){lt.subcount=lt.captions.length-1;break}lt.media.currentTime.toFixed(1)>=S(lt.captions[lt.subcount][0])&<.media.currentTime.toFixed(1)<=C(lt.captions[lt.subcount][0])?(lt.currentCaption=lt.captions[lt.subcount][1],lt.captionsContainer.innerHTML=lt.currentCaption):lt.captionsContainer.innerHTML=""}}function w(){lt.buttons.captions&&(d(lt.container,F.classes.captions.enabled,!0),F.captions.defaultActive&&(d(lt.container,F.classes.captions.active,!0),lt.buttons.captions.checked=!0))}function S(e){var t=[];return t=e.split(" --> "),E(t[0])}function C(e){var t=[];return t=e.split(" --> "),E(t[1])}function E(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 P(e){return lt.container.querySelectorAll(e)}function A(e){return P(e)[0]}function N(){try{return window.self!==window.top}catch(e){return!0}}function M(){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())),lt.container.insertAdjacentHTML("beforeend",e),F.tooltips)for(var r=P(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 L(){try{return lt.controls=A(F.selectors.controls),lt.buttons={},lt.buttons.seek=A(F.selectors.buttons.seek),lt.buttons.play=A(F.selectors.buttons.play),lt.buttons.pause=A(F.selectors.buttons.pause),lt.buttons.restart=A(F.selectors.buttons.restart),lt.buttons.rewind=A(F.selectors.buttons.rewind),lt.buttons.forward=A(F.selectors.buttons.forward),lt.buttons.fullscreen=A(F.selectors.buttons.fullscreen),lt.buttons.mute=A(F.selectors.buttons.mute),lt.buttons.captions=A(F.selectors.buttons.captions),lt.checkboxes=P("[type='checkbox']"),lt.progress={},lt.progress.container=A(F.selectors.progress.container),lt.progress.buffer={},lt.progress.buffer.bar=A(F.selectors.progress.buffer),lt.progress.buffer.text=lt.progress.buffer.bar&<.progress.buffer.bar.getElementsByTagName("span")[0],lt.progress.played={},lt.progress.played.bar=A(F.selectors.progress.played),lt.progress.played.text=lt.progress.played.bar&<.progress.played.bar.getElementsByTagName("span")[0],lt.volume=A(F.selectors.buttons.volume),lt.duration=A(F.selectors.duration),lt.currentTime=A(F.selectors.currentTime),lt.seekTime=P(F.selectors.seekTime),!0}catch(e){return n("It looks like there's a problem with your controls html. Bailing.",!0),lt.media.setAttribute("controls",""),!1}}function I(){if(lt.buttons.play){var e=lt.buttons.play.innerText||"Play";"undefined"!=typeof F.title&&F.title.length&&(e+=", "+F.title),lt.buttons.play.setAttribute("aria-label",e)}}function O(){if(!lt.media)return n("No audio or video element found!",!0),!1;if(lt.supported.full&&(lt.media.removeAttribute("controls"),d(lt.container,F.classes[lt.type],!0),d(lt.container,F.classes.stopped,null===lt.media.getAttribute("autoplay")),lt.browser.ios&&d(lt.container,"ios",!0),"video"===lt.type)){var e=document.createElement("div");e.setAttribute("class",F.classes.videoWrapper),i(lt.media,e),lt.videoContainer=e}null!==lt.media.getAttribute("autoplay")&&V()}function q(){if("video"===lt.type){lt.videoContainer.insertAdjacentHTML("afterbegin","
"),lt.captionsContainer=A(F.selectors.captions),lt.usingTextTracks=!1,lt.media.textTracks&&(lt.usingTextTracks=!0);for(var e,t="",r=lt.media.childNodes,s=0;s=10||"Firefox"===lt.browser.name&<.browser.version>=31||"Chrome"===lt.browser.name&<.browser.version>=43||"Safari"===lt.browser.name&<.browser.version>=7)&&(n("Detected unsupported browser for HTML5 captions. Using fallback."),lt.usingTextTracks=!1),lt.usingTextTracks){n("TextTracks supported.");for(var i=0;i=7){n("Safari 7+ detected; removing track from DOM."),a=lt.media.getElementsByTagName("track");for(var u=0;ut?t=0:t>lt.media.duration&&(t=lt.media.duration);try{lt.media.currentTime=t.toFixed(1)}catch(r){}n("Seeking to "+lt.media.currentTime+" seconds"),h(t)}function W(){d(lt.container,F.classes.playing,!lt.media.paused),d(lt.container,F.classes.stopped,lt.media.paused)}function z(e){function t(){d(lt.controls,F.classes.hover,!0),window.clearTimeout(s),a||(s=window.setTimeout(function(){d(lt.controls,F.classes.hover,!1)},2e3))}function n(e){a="mouseenter"===e.type}var r=T.supportsFullScreen;e&&e.type===T.fullScreenEventName?lt.isFullscreen=T.isFullScreen(lt.container):r?(T.isFullScreen(lt.container)?T.cancelFullScreen():T.requestFullScreen(lt.container),lt.isFullscreen=T.isFullScreen(lt.container)):(lt.isFullscreen=!lt.isFullscreen,lt.isFullscreen?(m(document,"keyup",X),document.body.style.overflow="hidden"):(y(document,"keyup",X),document.body.style.overflow="")),d(lt.container,F.classes.fullscreen.active,lt.isFullscreen);var s,a=!1;F.fullscreen.hideControls&&(d(lt.controls,F.classes.hover,!1),f(lt.controls,"mouseenter mouseleave",n,lt.isFullscreen),f(lt.container,"mousemove",t,lt.isFullscreen))}function X(e){27===(e.which||e.charCode||e.keyCode)&<.isFullscreen&&z()}function _(e){"undefined"==typeof e&&(e=F.storage.enabled&&x().supported?window.localStorage[F.storage.key]||F.volume:F.volume),e>10&&(e=10),0>e&&(e=0),lt.media.volume=parseFloat(e/10),lt.media.muted&&e>0&&J()}function J(e){"undefined"==typeof e&&(e=!lt.media.muted),lt.media.muted=e}function $(){var e=lt.media.muted?0:10*lt.media.volume;lt.supported.full&<.volume&&(lt.volume.value=e),F.storage.enabled&&x().supported&&window.localStorage.setItem(F.storage.key,e),d(lt.container,F.classes.muted,0===e),lt.supported.full&<.buttons.mute&&(lt.buttons.mute.checked=0===e)}function K(e){lt.supported.full&<.buttons.captions&&("undefined"==typeof e&&(e=-1===lt.container.className.indexOf(F.classes.captions.active),lt.buttons.captions.checked=e),d(lt.container,F.classes.captions.active,e))}function Y(e){var t="waiting"===e.type;clearTimeout(lt.loadingTimer),lt.loadingTimer=setTimeout(function(){d(lt.container,F.classes.loading,t)},t?250:0)}function G(e){var t=lt.progress.played.bar,n=lt.progress.played.text,r=0;if(e)switch(e.type){case"timeupdate":case"seeking":r=g(lt.media.currentTime,lt.media.duration),"timeupdate"==e.type&<.buttons.seek&&(lt.buttons.seek.value=r);break;case"change":case"input":r=e.target.value;break;case"playing":case"progress":t=lt.progress.buffer.bar,n=lt.progress.buffer.text,r=function(){var e=lt.media.buffered;return e.length?g(e.end(0),lt.media.duration):0}()}t&&(t.value=r),n&&(n.innerHTML=r)}function Q(e,t){if(t){lt.secs=parseInt(e%60),lt.mins=parseInt(e/60%60),lt.hours=parseInt(e/60/60%60);var n=parseInt(lt.media.duration/60/60%60)>0;lt.secs=("0"+lt.secs).slice(-2),lt.mins=("0"+lt.mins).slice(-2),t.innerHTML=(n?lt.hours+":":"")+lt.mins+":"+lt.secs}}function Z(){var e=lt.media.duration||0;!lt.duration&&F.displayDuration&<.media.paused&&Q(e,lt.currentTime),lt.duration&&Q(e,lt.duration)}function et(e){Q(lt.media.currentTime,lt.currentTime),G(e)}function tt(){for(var e=lt.media.querySelectorAll("source"),t=e.length-1;t>=0;t--)c(e[t]);lt.media.removeAttribute("src")}function nt(e){if(e.src){var t=document.createElement("source");p(t,e),u(lt.media,t)}}function rt(e){if(B(),U(),tt(),"string"==typeof e)lt.media.setAttribute("src",e);else if(e.constructor===Array)for(var t in e)nt(e[t]);lt.supported.full&&(et(),W()),lt.media.load(),null!==lt.media.getAttribute("autoplay")&&V()}function st(e){"video"===lt.type&<.media.setAttribute("poster",e)}function at(){var e="IE"==lt.browser.name?"change":"input";m(lt.buttons.play,"click",function(){V(),setTimeout(function(){lt.buttons.pause.focus()},100)}),m(lt.buttons.pause,"click",function(){B(),setTimeout(function(){lt.buttons.play.focus()},100)}),m(lt.buttons.restart,"click",U),m(lt.buttons.rewind,"click",j),m(lt.buttons.forward,"click",D),m(lt.buttons.seek,e,U),m(lt.volume,e,function(){_(this.value)}),m(lt.buttons.mute,"change",function(){J(this.checked)}),m(lt.buttons.fullscreen,"click",z),T.supportsFullScreen&&m(document,T.fullScreenEventName,z),m(lt.media,"timeupdate seeking",et),m(lt.media,"timeupdate",h),m(lt.media,"loadedmetadata",Z),m(lt.buttons.captions,"change",function(){K(this.checked)}),m(lt.media,"ended",function(){"video"===lt.type&&(lt.captionsContainer.innerHTML=""),W()}),m(lt.media,"progress",G),m(lt.media,"playing",G),m(lt.media,"volumechange",$),m(lt.media,"play pause",W),m(lt.media,"waiting canplay seeked",Y),m(lt.checkboxes,"keyup",b),"video"===lt.type&&F.click&&m(lt.videoContainer,"click",function(){lt.media.paused?v(lt.buttons.play,"click"):lt.media.ended?(U(),v(lt.buttons.play,"click")):v(lt.buttons.pause,"click")})}function ot(){if(!lt.init)return null;lt.container.setAttribute("class",F.selectors.container.replace(".","")),c(A(F.selectors.controls)),"video"===lt.type&&(c(A(F.selectors.captions)),l(lt.videoContainer)),lt.media.setAttribute("controls","");var e=lt.media.cloneNode(!0);lt.media.parentNode.replaceChild(e,lt.media),lt.init=!1}function it(){if(lt.init)return null;if(T=k(),lt.browser=r(),lt.media=lt.container.querySelectorAll("audio, video")[0],lt.type=lt.media.tagName.toLowerCase(),lt.supported=e.supported(lt.type),!lt.supported.basic)return!1;if(n(lt.browser.name+" "+lt.browser.version),O(),lt.supported.full){if(M(),!L())return!1;F.displayDuration&&Z(),I(),q(),_(),$(),H(),at()}lt.init=!0}var lt=this;return lt.container=a,it(),lt.init?{media:lt.media,play:V,pause:B,restart:U,rewind:j,forward:D,seek:U,source:rt,poster:st,setVolume:_,togglePlay:R,toggleMute:J,toggleCaptions:K,toggleFullscreen:z,isFullscreen:function(){return lt.isFullscreen||!1},support:function(e){return s(lt,e)},destroy:ot,restore:it}:{}}var T,F,S={enabled:!0,debug:!1,seekTime:10,volume:5,click:!0,tooltips:!1,displayDuration:!0,iconPrefix:"icon",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/gulpfile.js b/gulpfile.js index 96e13368..6c84bf69 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -185,12 +185,12 @@ gulp.task("watch", function () { // Plyr core gulp.watch(paths.plyr.src.js, tasks.js); gulp.watch(paths.plyr.src.less, tasks.less); - gulp.watch(paths.plyr.src.sprite, "sprite"); + gulp.watch(paths.plyr.src.sprite, ["sprite"]); // Docs gulp.watch(paths.docs.src.js, tasks.js); gulp.watch(paths.docs.src.less, tasks.less); - gulp.watch(paths.docs.src.templates, "js"); + gulp.watch(paths.docs.src.templates, ["js"]); }); // Publish a version to CDN and docs diff --git a/package.json b/package.json index 05368a49..91096dcd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plyr", - "version": "1.1.13", + "version": "1.1.14", "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 e28d0fbe..d8925c38 100644 --- a/readme.md +++ b/readme.md @@ -172,6 +172,12 @@ You can pass the following options to the setup method using `plyr.setup({...})` ["restart", "rewind", "play", "fast-forward", "current-time", "duration", "mute", "volume", "captions", "fullscreen"] Toggle which control elements you would like to display when using the default controls html. If you specify a html option, this is redundant. The default value is to display everything. + + iconPrefix + String + icon + Specify the id prefix for the icons used in the default controls (e.g. "icon-play" would be "icon"). This is to prevent clashes if you're using your own SVG defs file but with the default controls. Most people can ignore this option. + debug Boolean diff --git a/src/js/plyr.js b/src/js/plyr.js index adb35c12..debbecfc 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.1.13 +// plyr.js v1.1.14 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -22,6 +22,7 @@ click: true, tooltips: false, displayDuration: true, + iconPrefix: "icon", selectors: { container: ".player", controls: ".player-controls", @@ -105,7 +106,7 @@ if(_inArray(config.controls, "restart")) { html.push( "" ); @@ -115,7 +116,7 @@ if(_inArray(config.controls, "rewind")) { html.push( "" ); @@ -125,11 +126,11 @@ if(_inArray(config.controls, "play")) { html.push( "", "" ); @@ -139,7 +140,7 @@ if(_inArray(config.controls, "fast-forward")) { html.push( "" ); @@ -176,8 +177,8 @@ html.push( "", "" ); @@ -196,8 +197,8 @@ html.push( "", "" ); @@ -207,8 +208,8 @@ if(_inArray(config.controls, "fullscreen")) { html.push( "" );