diff options
| author | Sam Potts <me@sampotts.me> | 2015-03-22 11:05:28 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-03-22 11:05:28 +1100 |
| commit | c61db87fd676ce84db2fef7408bbed20a2bcd652 (patch) | |
| tree | 59ace07a2ba5db5a2b10e7cc6e14142fa415ffd7 | |
| parent | 388cb4df3964cf4db4e77eee5090bcf817c38dbc (diff) | |
| download | plyr-c61db87fd676ce84db2fef7408bbed20a2bcd652.tar.lz plyr-c61db87fd676ce84db2fef7408bbed20a2bcd652.tar.xz plyr-c61db87fd676ce84db2fef7408bbed20a2bcd652.zip | |
API improvements
| -rw-r--r-- | changelog.md | 6 | ||||
| -rw-r--r-- | dist/plyr.js | 2 | ||||
| -rw-r--r-- | docs/error.html | 2 | ||||
| -rw-r--r-- | docs/index.html | 26 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | readme.md | 16 | ||||
| -rw-r--r-- | src/js/plyr.js | 139 |
7 files changed, 127 insertions, 66 deletions
diff --git a/changelog.md b/changelog.md index fd90e3be..e3b30d41 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog +## v1.0.28 +- Added API support for browsers that don't have full plyr support (pretty much <=IE9 and `<video>` on iPhone/iPod) + +## v1.0.27 +- Keyboard accessibility improvements (Fixes #66) + ## v1.0.26 - Fixes for SASS (cheers @brunowego) - Indentation reset to 4 spaces diff --git a/dist/plyr.js b/dist/plyr.js index fc5b12fd..77bc5ad9 100644 --- a/dist/plyr.js +++ b/dist/plyr.js @@ -1 +1 @@ -!function(e){"use strict";function t(e,t){x.debug&&window.console&&console[t?"error":"log"](e)}function n(){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 r(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 s(e,t,n){return e.replace(new RegExp(t.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),n)}function a(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 o(e){e.parentNode.removeChild(e)}function i(e,t){e.insertBefore(t,e.firstChild)}function l(e,t){for(var n in t)e.setAttribute(n,t[n])}function c(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 u(e,t,n,r){if(t=t.split(" "),e instanceof NodeList)for(var s=0;s<e.length;s++)e[s]instanceof Node&&u(e[s],arguments[1],arguments[2],arguments[3]);else for(var a=0;a<t.length;a++)e[r?"addEventListener":"removeEventListener"](t[a],n,!1)}function p(e,t,n){u(e,t,n,!0)}function d(e,t,n){u(e,t,n,!1)}function f(e,t){var n=document.createEvent("MouseEvents");n.initEvent(t,!0,!0),e.dispatchEvent(n)}function m(e){return e.keyCode&&13!=e.keyCode?!0:(e.target.checked=!e.target.checked,e.target[e.target.checked?"setAttribute":"removeAttribute"]("checked",""),f(e.target,"change"),void 0)}function v(e,t){return 0===e||0===t||isNaN(e)||isNaN(t)?0:(e/t*100).toFixed(2)}function g(e,t){for(var n in t)t[n]&&t[n].constructor&&t[n].constructor===Object?(e[n]=e[n]||{},g(e[n],t[n])):e[n]=t[n];return e}function y(){var e={supportsFullScreen:!1,isFullScreen:function(){return!1},requestFullScreen:function(){},cancelFullScreen:function(){},fullScreenEventName:"",element:null,prefix:""},t="webkit moz o ms khtml".split(" ");if("undefined"!=typeof document.cancelFullScreen)e.supportsFullScreen=!0;else for(var n=0,r=t.length;r>n;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(){switch(this.prefix){case"":return document.fullScreen;case"webkit":return document.webkitIsFullScreen;case"ms":return null!==document.msFullscreenElement;default:return document[this.prefix+"FullScreen"]}},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 b(){var e={supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}()};return e}function h(e){function u(e){if(!et.usingTextTracks&&"video"===et.type){for(et.subcount=0,e="number"==typeof e?e:et.media.currentTime;h(et.captions[et.subcount][0])<e.toFixed(1);)if(et.subcount++,et.subcount>et.captions.length-1){et.subcount=et.captions.length-1;break}et.media.currentTime.toFixed(1)>=g(et.captions[et.subcount][0])&&et.media.currentTime.toFixed(1)<=h(et.captions[et.subcount][0])?(et.currentCaption=et.captions[et.subcount][1],et.captionsContainer.innerHTML=et.currentCaption):et.captionsContainer.innerHTML=""}}function f(){c(et.container,x.classes.captions.enabled,!0),x.captions.defaultActive&&(c(et.container,x.classes.captions.active,!0),et.buttons.captions.setAttribute("checked",""))}function g(e){var t=[];return t=e.split(" --> "),w(t[0])}function h(e){var t=[];return t=e.split(" --> "),w(t[1])}function w(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 T(e){return et.container.querySelectorAll(e)}function S(e){return T(e)[0]}function F(){try{return window.self!==window.top}catch(e){return!0}}function C(){t("Injecting custom controls.");var e=x.html;if(e=s(e,"{seektime}",x.seekTime),e=s(e,"{id}",et.random),et.container.insertAdjacentHTML("beforeend",e),x.tooltips)for(var n=T(x.selectors.labels),r=n.length-1;r>=0;r--){var a=n[r];c(a,x.classes.hidden,!1),c(a,x.classes.tooltip,!0)}}function E(){try{return et.controls=S(x.selectors.controls),et.buttons={},et.buttons.seek=S(x.selectors.buttons.seek),et.buttons.play=S(x.selectors.buttons.play),et.buttons.pause=S(x.selectors.buttons.pause),et.buttons.restart=S(x.selectors.buttons.restart),et.buttons.rewind=S(x.selectors.buttons.rewind),et.buttons.forward=S(x.selectors.buttons.forward),et.buttons.fullscreen=S(x.selectors.buttons.fullscreen),et.buttons.mute=S(x.selectors.buttons.mute),et.buttons.captions=S(x.selectors.buttons.captions),et.checkboxes=T("[type='checkbox']"),et.progress={},et.progress.container=S(x.selectors.progress.container),et.progress.buffer={},et.progress.buffer.bar=S(x.selectors.progress.buffer),et.progress.buffer.text=et.progress.buffer.bar.getElementsByTagName("span")[0],et.progress.played={},et.progress.played.bar=S(x.selectors.progress.played),et.progress.played.text=et.progress.played.bar.getElementsByTagName("span")[0],et.volume=S(x.selectors.buttons.volume),et.duration=S(x.selectors.duration),et.seekTime=T(x.selectors.seekTime),!0}catch(e){return t("It looks like there's a problem with your controls html. Bailing.",!0),!1}}function A(){var e=et.buttons.play.innerText||"Play";"undefined"!=typeof x.title&&x.title.length&&(e+=", "+x.title),et.buttons.play.setAttribute("aria-label",e)}function N(){if(et.media=et.container.querySelectorAll("audio, video")[0],!et.media)return t("No audio or video element found!",!0),!1;if(et.media.removeAttribute("controls"),et.type=et.media.tagName.toLowerCase(),c(et.container,x.classes[et.type],!0),c(et.container,x.classes.stopped,null===et.media.getAttribute("autoplay")),et.browser.ios&&c(et.container,"ios",!0),"video"===et.type){var e=document.createElement("div");e.setAttribute("class",x.classes.videoWrapper),a(et.media,e),et.videoContainer=e}null!==et.media.getAttribute("autoplay")&&M()}function P(){if("video"===et.type){et.videoContainer.insertAdjacentHTML("afterbegin","<div class='"+x.selectors.captions.replace(".","")+"'></div>"),et.captionsContainer=S(x.selectors.captions),et.usingTextTracks=!1,et.media.textTracks&&(et.usingTextTracks=!0);for(var e,n="",r=et.media.childNodes,s=0;s<r.length;s++)"track"===r[s].nodeName.toLowerCase()&&(e=r[s].getAttribute("kind"),"captions"===e&&(n=r[s].getAttribute("src")));if(et.captionExists=!0,""===n?(et.captionExists=!1,t("No caption track found.")):t("Caption track found; URI: "+n),et.captionExists){for(var a=et.media.textTracks,o=0;o<a.length;o++)a[o].mode="hidden";if(f(et),("IE"===et.browser.name&&10===et.browser.version||"IE"===et.browser.name&&11===et.browser.version||"Firefox"===et.browser.name&&et.browser.version>=31||"Safari"===et.browser.name&&et.browser.version>=7)&&(t("Detected IE 10/11 or Firefox 31+ or Safari 7+."),et.usingTextTracks=!1),et.usingTextTracks){t("TextTracks supported.");for(var i=0;i<a.length;i++){var l=a[i];"captions"===l.kind&&p(l,"cuechange",function(){this.activeCues[0]&&this.activeCues[0].hasOwnProperty("text")&&(et.captionsContainer.innerHTML=this.activeCues[0].text)})}}else if(t("TextTracks not supported so rendering captions manually."),et.currentCaption="",et.captions=[],""!==n){var u=new XMLHttpRequest;u.onreadystatechange=function(){if(4===u.readyState)if(200===u.status){var e,n=[],r=u.responseText;n=r.split("\n\n");for(var s=0;s<n.length;s++)e=n[s],et.captions[s]=[],et.captions[s]=e.split("\n");et.captions.shift(),t("Successfully loaded the caption file via AJAX.")}else t("There was a problem loading the caption file via AJAX.",!0)},u.open("get",n,!0),u.send()}if("Safari"===et.browser.name&&et.browser.version>=7){t("Safari 7+ detected; removing track from DOM."),a=et.media.getElementsByTagName("track");for(var d=0;d<a.length;d++)et.media.removeChild(a[d])}}else c(et.container,x.classes.captions.enabled)}}function L(){if("video"===et.type&&x.fullscreen.enabled){var e=k.supportsFullScreen;e||x.fullscreen.fallback&&!F()?(t((e?"Native":"Fallback")+" fullscreen enabled."),c(et.container,x.classes.fullscreen.enabled,!0)):t("Fullscreen not supported and fallback disabled.")}}function M(){et.media.play()}function I(){et.media.pause()}function O(e){"number"!=typeof e&&(e=x.seekTime),V(et.media.currentTime-e)}function q(e){"number"!=typeof e&&(e=x.seekTime),V(et.media.currentTime+e)}function V(e){var n=0;"number"==typeof e?n=e:"object"!=typeof e||"change"!==e.type&&"input"!==e.type||(n=e.target.value/e.target.max*et.media.duration),0>n?n=0:n>et.media.duration&&(n=et.media.duration);try{et.media.currentTime=n.toFixed(1)}catch(r){}t("Seeking to "+et.media.currentTime+" seconds"),u(n)}function H(){c(et.container,x.classes.playing,!et.media.paused),c(et.container,x.classes.stopped,et.media.paused)}function B(e){var t=k.supportsFullScreen;e&&e.type===k.fullScreenEventName?x.fullscreen.active=k.isFullScreen():t?(k.isFullScreen()?k.cancelFullScreen():k.requestFullScreen(et.container),x.fullscreen.active=k.isFullScreen()):(x.fullscreen.active=!x.fullscreen.active,x.fullscreen.active?(p(document,"keyup",R),document.body.style.overflow="hidden"):(d(document,"keyup",R),document.body.style.overflow="")),c(et.container,x.classes.fullscreen.active,x.fullscreen.active)}function R(e){27===(e.which||e.charCode||e.keyCode)&&x.fullscreen.active&&B()}function j(e){"undefined"==typeof e&&(e=x.storage.enabled&&b().supported?window.localStorage[x.storage.key]||x.volume:x.volume),e>10&&(e=10),et.volume.value=e,et.media.volume=parseFloat(e/10),D(),x.storage.enabled&&b().supported&&(window.localStorage.plyr_volume=e)}function W(e){"undefined"==typeof active&&(e=!et.media.muted,et.buttons.mute.checked=e),et.media.muted=e,D()}function _(e){"undefined"==typeof e&&(e=-1===et.container.className.indexOf(x.classes.captions.active),et.buttons.captions.checked=e),e?c(et.container,x.classes.captions.active,!0):c(et.container,x.classes.captions.active)}function D(){c(et.container,x.classes.muted,0===et.media.volume||et.media.muted)}function U(e){var t="waiting"===e.type;clearTimeout(et.loadingTimer),et.loadingTimer=setTimeout(function(){c(et.container,x.classes.loading,t)},t?250:0)}function X(e){var t=et.progress.played.bar,n=et.progress.played.text,r=0;if(e)switch(e.type){case"timeupdate":case"seeking":r=v(et.media.currentTime,et.media.duration),"timeupdate"==e.type&&(et.buttons.seek.value=r);break;case"change":case"input":r=e.target.value;break;case"playing":case"progress":t=et.progress.buffer.bar,n=et.progress.buffer.text,r=function(){var e=et.media.buffered;return e.length?v(e.end(0),et.media.duration):0}()}t.value=r,n.innerHTML=r}function J(){et.secs=parseInt(et.media.currentTime%60),et.mins=parseInt(et.media.currentTime/60%60),et.secs=("0"+et.secs).slice(-2),et.mins=("0"+et.mins).slice(-2),et.duration.innerHTML=et.mins+":"+et.secs}function $(e){J(),X(e)}function z(){for(var e=et.media.querySelectorAll("source"),t=e.length-1;t>=0;t--)o(e[t]);et.media.removeAttribute("src")}function K(e){if(e.src){var t=document.createElement("source");l(t,e),i(et.media,t)}}function Y(e){if(I(),V(),H(),z(),"string"==typeof e)et.media.setAttribute("src",e);else if(e.constructor===Array)for(var t in e)K(e[t]);$(),et.media.load(),null!==et.media.getAttribute("autoplay")&&M()}function G(e){"video"===et.type&&et.media.setAttribute("poster",e)}function Q(){p(et.buttons.play,"click",function(){M(),setTimeout(function(){et.buttons.pause.focus()},100)}),p(et.buttons.pause,"click",function(){I(),setTimeout(function(){et.buttons.play.focus()},100)}),p(et.buttons.restart,"click",V),p(et.buttons.rewind,"click",O),p(et.buttons.forward,"click",q),p(et.volume,"change input",function(){j(this.value)}),p(et.buttons.mute,"change",function(){W(this.checked)}),p(et.buttons.fullscreen,"click",B),p(document,k.fullScreenEventName,B),p(et.media,"timeupdate seeking",$),p(et.media,"timeupdate",u),p(et.buttons.seek,"change input",V),p(et.buttons.captions,"change",function(){_(this.checked)}),p(et.media,"ended",function(){"video"===et.type&&(et.captionsContainer.innerHTML=""),H()}),p(et.media,"progress",X),p(et.media,"playing",X),p(et.media,"volumechange",D),p(et.media,"play pause",H),p(et.media,"waiting canplay seeked",U),p(et.checkboxes,"keyup",m),"video"===et.type&&x.click&&p(et.videoContainer,"click",function(){et.media.paused?M():et.media.ended?(V(),M()):I()})}function Z(){return k=y(),et.browser=n(),t(et.browser.name+" "+et.browser.version),"IE"!==et.browser.name||8!==et.browser.version&&9!==et.browser.version?(N(),et.random=Math.floor(1e4*Math.random()),C(),E()?(A(),P(),j(),L(),Q(),!0):!1):(t("Browser not suppported.",!0),!1)}var et=this;return et.container=e,Z()?{media:et.media,play:M,pause:I,restart:V,rewind:O,forward:q,seek:V,setVolume:j,toggleMute:W,toggleCaptions:_,source:Y,poster:G,support:function(e){return r(et,e)}}:{}}var k,x,w={enabled:!0,debug:!1,seekTime:10,volume:5,click:!0,tooltips:!1,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",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",captions:{enabled:"captions-enabled",active:"captions-active"},fullscreen:{enabled:"fullscreen-enabled",active:"fullscreen-active"}},captions:{defaultActive:!1},fullscreen:{enabled:!0,fallback:!0},storage:{enabled:!0,key:"plyr_volume"},html:function(){return["<div class='player-controls'>","<div class='player-progress'>","<label for='seek{id}' class='sr-only'>Seek</label>","<input id='seek{id}' class='player-progress-seek' type='range' min='0' max='100' step='0.5' value='0' data-player='seek'>","<progress class='player-progress-played' max='100' value='0'>","<span>0</span>% played","</progress>","<progress class='player-progress-buffer' max='100' value='0'>","<span>0</span>% buffered","</progress>","</div>","<span class='player-controls-left'>","<button type='button' data-player='restart'>","<svg><use xlink:href='#icon-restart'></use></svg>","<span class='sr-only'>Restart</span>","</button>","<button type='button' data-player='rewind'>","<svg><use xlink:href='#icon-rewind'></use></svg>","<span class='sr-only'>Rewind {seektime} secs</span>","</button>","<button type='button' data-player='play'>","<svg><use xlink:href='#icon-play'></use></svg>","<span class='sr-only'>Play</span>","</button>","<button type='button' data-player='pause'>","<svg><use xlink:href='#icon-pause'></use></svg>","<span class='sr-only'>Pause</span>","</button>","<button type='button' data-player='fast-forward'>","<svg><use xlink:href='#icon-fast-forward'></use></svg>","<span class='sr-only'>Forward {seektime} secs</span>","</button>","<span class='player-time'>","<span class='sr-only'>Time</span>","<span class='player-duration'>00:00</span>","</span>","</span>","<span class='player-controls-right'>","<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>","<label id='mute{id}' for='mute{id}'>","<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>","<svg><use xlink:href='#icon-volume'></use></svg>","<span class='sr-only'>Toggle Mute</span>","</label>","<label for='volume{id}' class='sr-only'>Volume</label>","<input id='volume{id}' class='player-volume' type='range' min='0' max='10' value='5' data-player='volume'>","<input class='sr-only' id='captions{id}' type='checkbox' data-player='captions'>","<label for='captions{id}'>","<svg class='icon-captions-on'><use xlink:href='#icon-captions-on'></use></svg>","<svg><use xlink:href='#icon-captions-off'></use></svg>","<span class='sr-only'>Toggle Captions</span>","</label>","<button type='button' data-player='fullscreen'>","<svg class='icon-exit-fullscreen'><use xlink:href='#icon-exit-fullscreen'></use></svg>","<svg><use xlink:href='#icon-enter-fullscreen'></use></svg>","<span class='sr-only'>Toggle Fullscreen</span>","</button>","</span>","</div>"].join("\n")}()};e.setup=function(e){if(x=g(w,e),!x.enabled)return!1;for(var t=document.querySelectorAll(x.selectors.container),n=[],r=t.length-1;r>=0;r--){var s=t[r];if("video"!==s.querySelectorAll("audio, video")[0].tagName.toLowerCase()||!/iPhone/i.test(navigator.userAgent)){if("undefined"==typeof s.plyr){var a=new h(s);s.plyr=Object.keys(a).length?a:!1}n.push(s.plyr)}}return n}}(this.plyr=this.plyr||{});
\ No newline at end of file +!function(e){"use strict";function t(e,t){x.debug&&window.console&&console[t?"error":"log"](e)}function n(){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 r(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 s(e,t,n){return e.replace(new RegExp(t.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),n)}function a(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 o(e){e.parentNode.removeChild(e)}function i(e,t){e.insertBefore(t,e.firstChild)}function l(e,t){for(var n in t)e.setAttribute(n,t[n])}function c(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 u(e,t,n,r){if(t=t.split(" "),e instanceof NodeList)for(var s=0;s<e.length;s++)e[s]instanceof Node&&u(e[s],arguments[1],arguments[2],arguments[3]);else for(var a=0;a<t.length;a++)e[r?"addEventListener":"removeEventListener"](t[a],n,!1)}function p(e,t,n){u(e,t,n,!0)}function d(e,t,n){u(e,t,n,!1)}function f(e,t){var n=document.createEvent("MouseEvents");n.initEvent(t,!0,!0),e.dispatchEvent(n)}function m(e){return e.keyCode&&13!=e.keyCode?!0:(e.target.checked=!e.target.checked,e.target[e.target.checked?"setAttribute":"removeAttribute"]("checked",""),f(e.target,"change"),void 0)}function v(e,t){return 0===e||0===t||isNaN(e)||isNaN(t)?0:(e/t*100).toFixed(2)}function y(e,t){for(var n in t)t[n]&&t[n].constructor&&t[n].constructor===Object?(e[n]=e[n]||{},y(e[n],t[n])):e[n]=t[n];return e}function g(){var e={supportsFullScreen:!1,isFullScreen:function(){return!1},requestFullScreen:function(){},cancelFullScreen:function(){},fullScreenEventName:"",element:null,prefix:""},t="webkit moz o ms khtml".split(" ");if("undefined"!=typeof document.cancelFullScreen)e.supportsFullScreen=!0;else for(var n=0,r=t.length;r>n;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(){switch(this.prefix){case"":return document.fullScreen;case"webkit":return document.webkitIsFullScreen;case"ms":return null!==document.msFullscreenElement;default:return document[this.prefix+"FullScreen"]}},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 b(){var e={supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}()};return e}function h(u){function f(e){if(!tt.usingTextTracks&&"video"===tt.type&&tt.supported.full){for(tt.subcount=0,e="number"==typeof e?e:tt.media.currentTime;w(tt.captions[tt.subcount][0])<e.toFixed(1);)if(tt.subcount++,tt.subcount>tt.captions.length-1){tt.subcount=tt.captions.length-1;break}tt.media.currentTime.toFixed(1)>=h(tt.captions[tt.subcount][0])&&tt.media.currentTime.toFixed(1)<=w(tt.captions[tt.subcount][0])?(tt.currentCaption=tt.captions[tt.subcount][1],tt.captionsContainer.innerHTML=tt.currentCaption):tt.captionsContainer.innerHTML=""}}function y(){c(tt.container,x.classes.captions.enabled,!0),x.captions.defaultActive&&(c(tt.container,x.classes.captions.active,!0),tt.buttons.captions.setAttribute("checked",""))}function h(e){var t=[];return t=e.split(" --> "),T(t[0])}function w(e){var t=[];return t=e.split(" --> "),T(t[1])}function T(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 S(e){return tt.container.querySelectorAll(e)}function F(e){return S(e)[0]}function E(){try{return window.self!==window.top}catch(e){return!0}}function C(){t("Injecting custom controls.");var e=x.html;if(e=s(e,"{seektime}",x.seekTime),e=s(e,"{id}",tt.random),tt.container.insertAdjacentHTML("beforeend",e),x.tooltips)for(var n=S(x.selectors.labels),r=n.length-1;r>=0;r--){var a=n[r];c(a,x.classes.hidden,!1),c(a,x.classes.tooltip,!0)}}function A(){try{return tt.controls=F(x.selectors.controls),tt.buttons={},tt.buttons.seek=F(x.selectors.buttons.seek),tt.buttons.play=F(x.selectors.buttons.play),tt.buttons.pause=F(x.selectors.buttons.pause),tt.buttons.restart=F(x.selectors.buttons.restart),tt.buttons.rewind=F(x.selectors.buttons.rewind),tt.buttons.forward=F(x.selectors.buttons.forward),tt.buttons.fullscreen=F(x.selectors.buttons.fullscreen),tt.buttons.mute=F(x.selectors.buttons.mute),tt.buttons.captions=F(x.selectors.buttons.captions),tt.checkboxes=S("[type='checkbox']"),tt.progress={},tt.progress.container=F(x.selectors.progress.container),tt.progress.buffer={},tt.progress.buffer.bar=F(x.selectors.progress.buffer),tt.progress.buffer.text=tt.progress.buffer.bar.getElementsByTagName("span")[0],tt.progress.played={},tt.progress.played.bar=F(x.selectors.progress.played),tt.progress.played.text=tt.progress.played.bar.getElementsByTagName("span")[0],tt.volume=F(x.selectors.buttons.volume),tt.duration=F(x.selectors.duration),tt.seekTime=S(x.selectors.seekTime),!0}catch(e){return t("It looks like there's a problem with your controls html. Bailing.",!0),!1}}function N(){var e=tt.buttons.play.innerText||"Play";"undefined"!=typeof x.title&&x.title.length&&(e+=", "+x.title),tt.buttons.play.setAttribute("aria-label",e)}function P(){if(!tt.media)return t("No audio or video element found!",!0),!1;if(tt.supported.full&&tt.media.removeAttribute("controls"),c(tt.container,x.classes[tt.type],!0),c(tt.container,x.classes.stopped,null===tt.media.getAttribute("autoplay")),tt.browser.ios&&c(tt.container,"ios",!0),"video"===tt.type&&tt.supported.full){var e=document.createElement("div");e.setAttribute("class",x.classes.videoWrapper),a(tt.media,e),tt.videoContainer=e}null!==tt.media.getAttribute("autoplay")&&L()}function M(){if("video"===tt.type){tt.videoContainer.insertAdjacentHTML("afterbegin","<div class='"+x.selectors.captions.replace(".","")+"'></div>"),tt.captionsContainer=F(x.selectors.captions),tt.usingTextTracks=!1,tt.media.textTracks&&(tt.usingTextTracks=!0);for(var e,n="",r=tt.media.childNodes,s=0;s<r.length;s++)"track"===r[s].nodeName.toLowerCase()&&(e=r[s].getAttribute("kind"),"captions"===e&&(n=r[s].getAttribute("src")));if(tt.captionExists=!0,""===n?(tt.captionExists=!1,t("No caption track found.")):t("Caption track found; URI: "+n),tt.captionExists){for(var a=tt.media.textTracks,o=0;o<a.length;o++)a[o].mode="hidden";if(y(tt),("IE"===tt.browser.name&&10===tt.browser.version||"IE"===tt.browser.name&&11===tt.browser.version||"Firefox"===tt.browser.name&&tt.browser.version>=31||"Safari"===tt.browser.name&&tt.browser.version>=7)&&(t("Detected IE 10/11 or Firefox 31+ or Safari 7+."),tt.usingTextTracks=!1),tt.usingTextTracks){t("TextTracks supported.");for(var i=0;i<a.length;i++){var l=a[i];"captions"===l.kind&&p(l,"cuechange",function(){this.activeCues[0]&&this.activeCues[0].hasOwnProperty("text")&&(tt.captionsContainer.innerHTML=this.activeCues[0].text)})}}else if(t("TextTracks not supported so rendering captions manually."),tt.currentCaption="",tt.captions=[],""!==n){var u=new XMLHttpRequest;u.onreadystatechange=function(){if(4===u.readyState)if(200===u.status){var e,n=[],r=u.responseText;n=r.split("\n\n");for(var s=0;s<n.length;s++)e=n[s],tt.captions[s]=[],tt.captions[s]=e.split("\n");tt.captions.shift(),t("Successfully loaded the caption file via AJAX.")}else t("There was a problem loading the caption file via AJAX.",!0)},u.open("get",n,!0),u.send()}if("Safari"===tt.browser.name&&tt.browser.version>=7){t("Safari 7+ detected; removing track from DOM."),a=tt.media.getElementsByTagName("track");for(var d=0;d<a.length;d++)tt.media.removeChild(a[d])}}else c(tt.container,x.classes.captions.enabled)}}function I(){if("video"===tt.type&&x.fullscreen.enabled){var e=k.supportsFullScreen;e||x.fullscreen.fallback&&!E()?(t((e?"Native":"Fallback")+" fullscreen enabled."),c(tt.container,x.classes.fullscreen.enabled,!0)):t("Fullscreen not supported and fallback disabled.")}}function L(){tt.media.play()}function O(){tt.media.pause()}function q(e){"number"!=typeof e&&(e=x.seekTime),H(tt.media.currentTime-e)}function V(e){"number"!=typeof e&&(e=x.seekTime),H(tt.media.currentTime+e)}function H(e){var n=0;"number"==typeof e?n=e:"object"!=typeof e||"change"!==e.type&&"input"!==e.type||(n=e.target.value/e.target.max*tt.media.duration),0>n?n=0:n>tt.media.duration&&(n=tt.media.duration);try{tt.media.currentTime=n.toFixed(1)}catch(r){}t("Seeking to "+tt.media.currentTime+" seconds"),f(n)}function R(){c(tt.container,x.classes.playing,!tt.media.paused),c(tt.container,x.classes.stopped,tt.media.paused)}function j(e){var t=k.supportsFullScreen;e&&e.type===k.fullScreenEventName?x.fullscreen.active=k.isFullScreen():t?(k.isFullScreen()?k.cancelFullScreen():k.requestFullScreen(tt.container),x.fullscreen.active=k.isFullScreen()):(x.fullscreen.active=!x.fullscreen.active,x.fullscreen.active?(p(document,"keyup",B),document.body.style.overflow="hidden"):(d(document,"keyup",B),document.body.style.overflow="")),c(tt.container,x.classes.fullscreen.active,x.fullscreen.active)}function B(e){27===(e.which||e.charCode||e.keyCode)&&x.fullscreen.active&&j()}function W(e){"undefined"==typeof e&&(e=x.storage.enabled&&b().supported?window.localStorage[x.storage.key]||x.volume:x.volume),e>10&&(e=10),tt.supported.full&&(tt.volume.value=e),tt.media.volume=parseFloat(e/10),U(),x.storage.enabled&&b().supported&&(window.localStorage.plyr_volume=e)}function _(e){"undefined"==typeof e&&(e=!tt.media.muted),tt.supported.full&&(tt.buttons.mute.checked=e),tt.media.muted=e,U()}function D(e){tt.supported.plyr&&("undefined"==typeof active&&(e=-1===tt.container.className.indexOf(x.classes.captions.active),tt.buttons.captions.checked=e),e?c(tt.container,x.classes.captions.active,!0):c(tt.container,x.classes.captions.active))}function U(){c(tt.container,x.classes.muted,0===tt.media.volume||tt.media.muted)}function X(e){var t="waiting"===e.type;clearTimeout(tt.loadingTimer),tt.loadingTimer=setTimeout(function(){c(tt.container,x.classes.loading,t)},t?250:0)}function J(e){var t=tt.progress.played.bar,n=tt.progress.played.text,r=0;if(e)switch(e.type){case"timeupdate":case"seeking":r=v(tt.media.currentTime,tt.media.duration),"timeupdate"==e.type&&(tt.buttons.seek.value=r);break;case"change":case"input":r=e.target.value;break;case"playing":case"progress":t=tt.progress.buffer.bar,n=tt.progress.buffer.text,r=function(){var e=tt.media.buffered;return e.length?v(e.end(0),tt.media.duration):0}()}t.value=r,n.innerHTML=r}function $(){tt.secs=parseInt(tt.media.currentTime%60),tt.mins=parseInt(tt.media.currentTime/60%60),tt.secs=("0"+tt.secs).slice(-2),tt.mins=("0"+tt.mins).slice(-2),tt.duration.innerHTML=tt.mins+":"+tt.secs}function z(e){$(),J(e)}function K(){for(var e=tt.media.querySelectorAll("source"),t=e.length-1;t>=0;t--)o(e[t]);tt.media.removeAttribute("src")}function Y(e){if(e.src){var t=document.createElement("source");l(t,e),i(tt.media,t)}}function G(e){if(O(),H(),R(),K(),"string"==typeof e)tt.media.setAttribute("src",e);else if(e.constructor===Array)for(var t in e)Y(e[t]);tt.supported.full&&z(),tt.media.load(),null!==tt.media.getAttribute("autoplay")&&L()}function Q(e){"video"===tt.type&&tt.media.setAttribute("poster",e)}function Z(){p(tt.buttons.play,"click",function(){L(),setTimeout(function(){tt.buttons.pause.focus()},100)}),p(tt.buttons.pause,"click",function(){O(),setTimeout(function(){tt.buttons.play.focus()},100)}),p(tt.buttons.restart,"click",H),p(tt.buttons.rewind,"click",q),p(tt.buttons.forward,"click",V),p(tt.volume,"change input",function(){W(this.value)}),p(tt.buttons.mute,"change",function(){_(this.checked)}),p(tt.buttons.fullscreen,"click",j),k.supportsFullScreen&&p(document,k.fullScreenEventName,j),p(tt.media,"timeupdate seeking",z),p(tt.media,"timeupdate",f),p(tt.buttons.seek,"change input",H),p(tt.buttons.captions,"change",function(){D(this.checked)}),p(tt.media,"ended",function(){"video"===tt.type&&(tt.captionsContainer.innerHTML=""),R()}),p(tt.media,"progress",J),p(tt.media,"playing",J),p(tt.media,"volumechange",U),p(tt.media,"play pause",R),p(tt.media,"waiting canplay seeked",X),p(tt.checkboxes,"keyup",m),"video"===tt.type&&x.click&&p(tt.videoContainer,"click",function(){tt.media.paused?L():tt.media.ended?(H(),L()):O()})}function et(){if(k=g(),tt.browser=n(),tt.supported=e.supported(),!tt.supported.basic)return!1;if(tt.media=tt.container.querySelectorAll("audio, video")[0],tt.type=tt.media.tagName.toLowerCase(),/iPhone|iPod/i.test(navigator.userAgent)&&"video"===tt.type&&(tt.supported.full=!1),t(tt.browser.name+" "+tt.browser.version),P(),tt.random=Math.floor(1e4*Math.random()),tt.supported.full){if(C(),!A())return!1;N(),M(),W(),I(),Z()}return!0}var tt=this;return tt.container=u,et()?{media:tt.media,play:L,pause:O,restart:H,rewind:q,forward:V,seek:H,setVolume:W,toggleMute:_,toggleCaptions:D,source:G,poster:Q,support:function(e){return r(tt,e)}}:{}}var k,x,w={enabled:!0,debug:!1,seekTime:10,volume:5,click:!0,tooltips:!1,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",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",captions:{enabled:"captions-enabled",active:"captions-active"},fullscreen:{enabled:"fullscreen-enabled",active:"fullscreen-active"}},captions:{defaultActive:!1},fullscreen:{enabled:!0,fallback:!0},storage:{enabled:!0,key:"plyr_volume"},html:function(){return["<div class='player-controls'>","<div class='player-progress'>","<label for='seek{id}' class='sr-only'>Seek</label>","<input id='seek{id}' class='player-progress-seek' type='range' min='0' max='100' step='0.5' value='0' data-player='seek'>","<progress class='player-progress-played' max='100' value='0'>","<span>0</span>% played","</progress>","<progress class='player-progress-buffer' max='100' value='0'>","<span>0</span>% buffered","</progress>","</div>","<span class='player-controls-left'>","<button type='button' data-player='restart'>","<svg><use xlink:href='#icon-restart'></use></svg>","<span class='sr-only'>Restart</span>","</button>","<button type='button' data-player='rewind'>","<svg><use xlink:href='#icon-rewind'></use></svg>","<span class='sr-only'>Rewind {seektime} secs</span>","</button>","<button type='button' data-player='play'>","<svg><use xlink:href='#icon-play'></use></svg>","<span class='sr-only'>Play</span>","</button>","<button type='button' data-player='pause'>","<svg><use xlink:href='#icon-pause'></use></svg>","<span class='sr-only'>Pause</span>","</button>","<button type='button' data-player='fast-forward'>","<svg><use xlink:href='#icon-fast-forward'></use></svg>","<span class='sr-only'>Forward {seektime} secs</span>","</button>","<span class='player-time'>","<span class='sr-only'>Time</span>","<span class='player-duration'>00:00</span>","</span>","</span>","<span class='player-controls-right'>","<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>","<label id='mute{id}' for='mute{id}'>","<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>","<svg><use xlink:href='#icon-volume'></use></svg>","<span class='sr-only'>Toggle Mute</span>","</label>","<label for='volume{id}' class='sr-only'>Volume</label>","<input id='volume{id}' class='player-volume' type='range' min='0' max='10' value='5' data-player='volume'>","<input class='sr-only' id='captions{id}' type='checkbox' data-player='captions'>","<label for='captions{id}'>","<svg class='icon-captions-on'><use xlink:href='#icon-captions-on'></use></svg>","<svg><use xlink:href='#icon-captions-off'></use></svg>","<span class='sr-only'>Toggle Captions</span>","</label>","<button type='button' data-player='fullscreen'>","<svg class='icon-exit-fullscreen'><use xlink:href='#icon-exit-fullscreen'></use></svg>","<svg><use xlink:href='#icon-enter-fullscreen'></use></svg>","<span class='sr-only'>Toggle Fullscreen</span>","</button>","</span>","</div>"].join("\n")}()};e.supported=function(){var e=n(),t=!!document.createElement("audio").canPlayType&&!!document.createElement("video").canPlayType;return{basic:t,full:t&&!("IE"===e.name&&e.version<=9)}},e.setup=function(t){if(x=y(w,t),!x.enabled||!e.supported().basic)return!1;for(var n=document.querySelectorAll(x.selectors.container),r=[],s=n.length-1;s>=0;s--){var a=n[s];if("undefined"==typeof a.plyr){var o=new h(a);a.plyr=Object.keys(o).length?o:!1}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 608050a1..a0f004fc 100644 --- a/docs/error.html +++ b/docs/error.html @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Docs styles --> - <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/docs.css"> + <link rel="stylesheet" href="//cdn.plyr.io/1.0.28/docs.css"> </head> <body> <main> diff --git a/docs/index.html b/docs/index.html index 5d84fc79..c6742f07 100644 --- a/docs/index.html +++ b/docs/index.html @@ -8,10 +8,10 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Styles --> - <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css"> + <link rel="stylesheet" href="//cdn.plyr.io/1.0.28/plyr.css"> <!-- Docs styles --> - <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/docs.css"> + <link rel="stylesheet" href="//cdn.plyr.io/1.0.28/docs.css"> </head> <body> <header> @@ -67,13 +67,29 @@ <!-- Load SVG defs --> <!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store --> <script> - (function(d,p){var a=new XMLHttpRequest(),b=d.body;a.open("GET",p,!0);a.send();a.onload=function(){var c=d.createElement("div");c.style.display="none";c.innerHTML=a.responseText;b.insertBefore(c,b.childNodes[0])}})(document,"//cdn.plyr.io/1.0.27/sprite.svg"); + (function(d, u){ + var a = new XMLHttpRequest(), + b = d.body; + + // Check for CORS support + // If you're loading from same domain, you can remove the if statement + if("withCredentials" in a) { + a.open("GET", u, true); + a.send(); + a.onload = function(){ + var c = d.createElement("div"); + c.style.display="none"; + c.innerHTML = a.responseText; + b.insertBefore(c, b.childNodes[0]); + } + } + })(document, "https://cdn.plyr.io/1.0.28/sprite.svg"); </script> <!-- Plyr core script --> - <script src="//cdn.plyr.io/1.0.27/plyr.js"></script> + <script src="//cdn.plyr.io/1.0.28/plyr.js"></script> <!-- Docs script --> - <script src="//cdn.plyr.io/1.0.27/docs.js"></script> + <script src="//cdn.plyr.io/1.0.28/docs.js"></script> </body> </html>
\ No newline at end of file diff --git a/package.json b/package.json index 4ab8f6fd..5751a763 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plyr", - "version": "1.0.27", + "version": "1.0.28", "description": "A simple HTML5 media player using custom controls", "homepage": "http://plyr.io", "main": "gulpfile.js", @@ -10,7 +10,7 @@ We wanted a lightweight, accessible and customisable media player that just supp ## Features - **Accessible** - full support for captions and screen readers. -- **Lightweight** - just 5.7KB minified and gzipped. +- **Lightweight** - just 6KB minified and gzipped. - **Customisable** - make the player look how you want with the markup you want. - **Semantic** - uses the *right* elements. `<input type="range">` for volume and `<progress>` for progress and well, `<button>`s for buttons. There's no `<span>` or `<a href="#">` button hacks. - **Responsive** - as you'd expect these days. @@ -38,7 +38,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.0.27/plyr.js` to `https://cdn.plyr.io/1.0.27/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.0.28/plyr.js` to `https://cdn.plyr.io/1.0.28/plyr.js` ### Bower If bower is your thang, you can grab Plyr using: @@ -51,11 +51,11 @@ More info on setting up dependencies can be found in the [Bower Docs](http://bow If you want to use our CDN, you can use the following. HTTPS (SSL) is supported. ```html -<link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css"> -<script src="//cdn.plyr.io/1.0.27/plyr.js"></script> +<link rel="stylesheet" href="//cdn.plyr.io/1.0.28/plyr.css"> +<script src="//cdn.plyr.io/1.0.28/plyr.js"></script> ``` -You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.27/sprite.svg`. +You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.28/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. @@ -359,15 +359,15 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt <td>✔</td> <td>✔</td> <td>✔</td> - <td>✖²</td> + <td>API²</td> <td>✔³</td> </tr> </tbody> </table> -¹ iPhone forces the native player for `<video>` so no customisation possible. `<audio>` elements have volume controls disabled. +¹ Mobile Safari on the iPhone forces the native player for `<video>` so no useful customisation is possible. `<audio>` elements have volume controls disabled. -² Native player used (no support for `<progress>` or `<input type="range">`) +² Native player used (no support for `<progress>` or `<input type="range">`) but the API is supported (v1.0.28+) ³ IE10 has no native fullscreen support, fallback can be used (see options) diff --git a/src/js/plyr.js b/src/js/plyr.js index fd408709..6ef6cb75 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.0.27 +// plyr.js v1.0.28 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -219,7 +219,7 @@ // Check for mime type support against a player instance // Credits: http://diveintohtml5.info/everything.html // Related: http://www.leanbackplayer.com/test/h5mt.html - function _support(player, mimeType) { + function _supportMime(player, mimeType) { var media = player.media; // Only check video types for video players @@ -496,7 +496,7 @@ // Seek the manual caption time and update UI function _seekManualCaptions(time) { // If it's not video, or we're using textTracks, bail. - if (player.usingTextTracks || player.type !== "video") { + if (player.usingTextTracks || player.type !== "video" || !player.supported.full) { return; } @@ -681,8 +681,6 @@ // Setup media function _setupMedia() { - player.media = player.container.querySelectorAll("audio, video")[0]; - // If there's no media, bail if(!player.media) { _log("No audio or video element found!", true); @@ -690,10 +688,9 @@ } // Remove native video controls - player.media.removeAttribute("controls"); - - // Set media type - player.type = player.media.tagName.toLowerCase(); + if(player.supported.full) { + player.media.removeAttribute("controls"); + } // Add type class _toggleClass(player.container, config.classes[player.type], true); @@ -707,7 +704,7 @@ } // Inject the player wrapper - if(player.type === "video") { + if(player.type === "video" && player.supported.full) { // Create the wrapper div var wrapper = document.createElement("div"); wrapper.setAttribute("class", config.classes.videoWrapper); @@ -1027,8 +1024,15 @@ volume = 10; } - player.volume.value = volume; + // If the controls are there + if(player.supported.full) { + player.volume.value = volume; + } + + // Set the player volume player.media.volume = parseFloat(volume / 10); + + // Update the UI _checkMute(); // Store the volume in storage @@ -1040,24 +1044,35 @@ // Mute function _toggleMute(muted) { // If the method is called without parameter, toggle based on current value - if(typeof active === "undefined") { + if(typeof muted === "undefined") { muted = !player.media.muted; + } + + // If the controls are there + if(player.supported.full) { player.buttons.mute.checked = muted; } + // Set mute on the player player.media.muted = muted; + + // Update UI _checkMute(); } // Toggle captions - function _toggleCaptions(active) { + function _toggleCaptions(show) { + if(!player.supported.plyr) { + return; + } + // If the method is called without parameter, toggle based on current value if(typeof active === "undefined") { - active = (player.container.className.indexOf(config.classes.captions.active) === -1); - player.buttons.captions.checked = active; + show = (player.container.className.indexOf(config.classes.captions.active) === -1); + player.buttons.captions.checked = show; } - if (active) { + if (show) { _toggleClass(player.container, config.classes.captions.active, true); } else { @@ -1214,7 +1229,9 @@ } // Reset time display - _timeUpdate(); + if(player.supported.full) { + _timeUpdate(); + } // Re-load sources player.media.load(); @@ -1270,7 +1287,9 @@ _on(player.buttons.fullscreen, "click", _toggleFullscreen); // Handle user exiting fullscreen by escaping etc - _on(document, fullscreen.fullScreenEventName, _toggleFullscreen); + if(fullscreen.supportsFullScreen) { + _on(document, fullscreen.fullScreenEventName, _toggleFullscreen); + } // Time change on media _on(player.media, "timeupdate seeking", _timeUpdate); @@ -1336,47 +1355,62 @@ // Setup the fullscreen api fullscreen = _fullscreen(); - // Sniff + // Sniff out the browser player.browser = _browserSniff(); - // Debug info - _log(player.browser.name + " " + player.browser.version); + // Check for full support + player.supported = api.supported(); - // If IE8, stop customization (use fallback) - // If IE9, stop customization (use native controls) - if (player.browser.name === "IE" && (player.browser.version === 8 || player.browser.version === 9) ) { - _log("Browser not suppported.", true); + // If no native support, bail + if(!player.supported.basic) { return false; } + // Get the media element + player.media = player.container.querySelectorAll("audio, video")[0]; + + // Set media type + player.type = player.media.tagName.toLowerCase(); + + // If iPhone/iPod and video, customisation support is limited + if(/iPhone|iPod/i.test(navigator.userAgent) && player.type === "video") { + player.supported.full = false; + } + + // Debug info + _log(player.browser.name + " " + player.browser.version); + // Setup media _setupMedia(); // Generate random number for id/for attribute values for controls player.random = Math.floor(Math.random() * (10000)); - // Inject custom controls - _injectControls(); + // If there's full support + if(player.supported.full) { + // Inject custom controls + _injectControls(); - // Find the elements - if(!_findElements()) { - return false; - } + // Find the elements + if(!_findElements()) { + return false; + } - // Set up aria-label for Play button with the title option - _setupAria(); + // Set up aria-label for Play button with the title option + _setupAria(); - // Captions - _setupCaptions(); + // Captions + _setupCaptions(); - // Set volume - _setVolume(); + // Set volume + _setVolume(); - // Setup fullscreen - _setupFullscreen(); + // Setup fullscreen + _setupFullscreen(); - // Listeners - _listeners(); + // Listeners + _listeners(); + } // Successful setup return true; @@ -1399,10 +1433,21 @@ toggleCaptions: _toggleCaptions, source: _parseSource, poster: _updatePoster, - support: function(mimeType) { return _support(player, mimeType); } + support: function(mimeType) { return _supportMime(player, mimeType); } } } + // Check for support + api.supported = function() { + var browser = _browserSniff(), + basic = (!!document.createElement("audio").canPlayType && !!document.createElement("video").canPlayType); + + return { + basic: basic, + full: basic && !(browser.name === "IE" && (browser.version <= 9)) + }; + } + // Expose setup function api.setup = function(options){ // Extend the default options with user specified @@ -1410,7 +1455,7 @@ // If enabled carry on // You may want to disable certain UAs etc - if(!config.enabled) { + if(!config.enabled || !api.supported().basic) { return false; } @@ -1423,13 +1468,6 @@ // Get the current element var element = elements[i]; - // Disabled for <video> for iPhone - // Since it doesn't allow customisation - if (element.querySelectorAll("audio, video")[0].tagName.toLowerCase() === "video" - && /iPhone/i.test(navigator.userAgent)) { - continue; - } - // Setup a player instance and add to the element if(typeof element.plyr === "undefined") { // Create new instance @@ -1445,4 +1483,5 @@ return players; } + }(this.plyr = this.plyr || {}));
\ No newline at end of file |