From c6e5937debb0f9eef1bccf5a0318b287c28cbee6 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 5 Mar 2015 22:38:25 +1100 Subject: [PATCH] Seeking improvements --- dist/plyr.js | 2 +- readme.md | 10 +++- src/js/plyr.js | 148 +++++++++++++++++++++---------------------------- 3 files changed, 71 insertions(+), 89 deletions(-) diff --git a/dist/plyr.js b/dist/plyr.js index 0c556429..38eda61d 100644 --- a/dist/plyr.js +++ b/dist/plyr.js @@ -1 +1 @@ -!function(e){"use strict";function t(e,t){b.debug&&window.console&&console[t?"error":"log"](e)}function n(){var e,t,n,s=navigator.userAgent,r=navigator.appName,a=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10);return-1!==navigator.appVersion.indexOf("Windows NT")&&-1!==navigator.appVersion.indexOf("rv:11")?(r="IE",a="11;"):-1!==(t=s.indexOf("MSIE"))?(r="IE",a=s.substring(t+5)):-1!==(t=s.indexOf("Chrome"))?(r="Chrome",a=s.substring(t+7)):-1!==(t=s.indexOf("Safari"))?(r="Safari",a=s.substring(t+7),-1!==(t=s.indexOf("Version"))&&(a=s.substring(t+8))):-1!==(t=s.indexOf("Firefox"))?(r="Firefox",a=s.substring(t+8)):(e=s.lastIndexOf(" ")+1)<(t=s.lastIndexOf("/"))&&(r=s.substring(e,t),a=s.substring(t+1),r.toLowerCase()==r.toUpperCase()&&(r=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)),[r,o]}function s(e,t,n){return e.replace(new RegExp(t.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),n)}function r(e,t){e.length||(e=[e]);for(var n=e.length-1;n>=0;n--){var s=n>0?t.cloneNode(!0):t,r=e[n],a=r.parentNode,o=r.nextSibling;s.appendChild(r),o?a.insertBefore(s,o):a.appendChild(s)}}function a(e,t,n){if(e)if(e.classList)e.classList[n?"add":"remove"](t);else{var s=(" "+e.className+" ").replace(/\s+/g," ").replace(" "+t+" ","");e.className=s+(n?" "+t:"")}}function o(e,t,n,s){t=t.split(" ");for(var r=0;rn;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 d(){var e={supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}()};return e}function f(e){function o(){for(U.subcount=0;v(U.captions[U.subcount][0])U.captions.length-1){U.subcount=U.captions.length-1;break}}function u(){a(U.container,b.classes.captions.enabled,!0),b.captions.defaultActive&&(a(U.container,b.classes.captions.active,!0),U.buttons.captions.setAttribute("checked","checked"))}function f(e){var t=[];return t=e.split(" --> "),g(t[0])}function v(e){var t=[];return t=e.split(" --> "),g(t[1])}function g(e){if(null===e||void 0===e)return 0;var t,n=[],s=[];return n=e.split(","),s=n[0].split(":"),t=Math.floor(60*s[0]*60)+Math.floor(60*s[1])+Math.floor(s[2])}function y(e){return U.container.querySelectorAll(e)}function h(e){return y(e)[0]}function k(){try{return window.self!==window.top}catch(e){return!0}}function x(){t("Injecting custom controls.");var e=b.html;e=s(e,"{seektime}",b.seekTime),e=s(e,"{id}",U.random),U.container.insertAdjacentHTML("beforeend",e)}function w(){try{return U.controls=h(b.selectors.controls),U.buttons={},U.buttons.seek=h(b.selectors.buttons.seek),U.buttons.play=h(b.selectors.buttons.play),U.buttons.pause=h(b.selectors.buttons.pause),U.buttons.restart=h(b.selectors.buttons.restart),U.buttons.rewind=h(b.selectors.buttons.rewind),U.buttons.forward=h(b.selectors.buttons.forward),U.buttons.mute=h(b.selectors.buttons.mute),U.buttons.captions=h(b.selectors.buttons.captions),U.buttons.fullscreen=h(b.selectors.buttons.fullscreen),U.progress={},U.progress.container=h(b.selectors.progress.container),U.progress.buffer={},U.progress.buffer.bar=h(b.selectors.progress.buffer),U.progress.buffer.text=U.progress.buffer.bar.getElementsByTagName("span")[0],U.progress.played={},U.progress.played.bar=h(b.selectors.progress.played),U.progress.played.text=U.progress.played.bar.getElementsByTagName("span")[0],U.volume=h(b.selectors.buttons.volume),U.duration=h(b.selectors.duration),U.seekTime=y(b.selectors.seekTime),!0}catch(e){return t("It looks like there's a problem with your controls html. Bailing.",!0),!1}}function T(){var e=U.buttons.play.innerText||"Play";"undefined"!=typeof b.title&&b.title.length&&(e+=", "+b.title),U.buttons.play.setAttribute("aria-label",e)}function S(){if(U.media=U.container.querySelectorAll("audio, video")[0],!U.media)return t("No audio or video element found!",!0),!1;if(U.media.removeAttribute("controls"),U.type="video"==U.media.tagName.toLowerCase()?"video":"audio",a(U.container,b.classes[U.type],!0),a(U.container,b.classes.stopped,null===U.media.getAttribute("autoplay")),"video"===U.type){var e=document.createElement("div");e.setAttribute("class",b.classes.videoWrapper),r(U.media,e),U.videoContainer=e}}function F(){if("video"===U.type){U.videoContainer.insertAdjacentHTML("afterbegin","
"),U.captionsContainer=h(b.selectors.captions),U.isTextTracks=!1,U.media.textTracks&&(U.isTextTracks=!0);for(var e,n="",s=U.media.childNodes,r=0;r=31||"Safari"===U.browserName&&U.browserMajorVersion>=7)&&(t("Detected IE 10/11 or Firefox 31+ or Safari 7+."),U.isTextTracks=!1),U.isTextTracks){t("TextTracks supported.");for(var c=0;cf(U.captions[U.subcount][0])&&U.media.currentTime.toFixed(1)v(U.captions[U.subcount][0])&&U.subcount=7){t("Safari 7+ detected; removing track from DOM."),o=U.media.getElementsByTagName("track");for(var m=0;m10&&(e=10),U.volume.value=e,U.media.volume=parseFloat(e/10),R(),b.storage.enabled&&d().supported&&(window.localStorage.plyr_volume=e)}function q(e){"undefined"==typeof active&&(e=!U.media.muted,U.buttons.mute.checked=e),U.media.muted=e,R()}function H(e){"undefined"==typeof e&&(e=-1===U.container.className.indexOf(b.classes.captions.active),U.buttons.captions.checked=e),e?a(U.container,b.classes.captions.active,!0):a(U.container,b.classes.captions.active)}function R(){a(U.container,b.classes.muted,0===U.media.volume||U.media.muted)}function B(e){var t,n,s=0;switch(e.type){case"timeupdate":case"seeking":t=U.progress.played.bar,n=U.progress.played.text,s=c(U.media.currentTime,U.media.duration),"timeupdate"==e.type&&(U.buttons.seek.value=s);break;case"change":case"input":t=U.progress.played.bar,n=U.progress.played.text,s=e.target.value;break;case"playing":case"progress":t=U.progress.buffer.bar,n=U.progress.buffer.text,s=function(){var e=U.media.buffered;return e.length?c(e.end(0),U.media.duration):0}()}t&&s>0&&(t.value=s,n.innerHTML=s)}function P(){U.secs=parseInt(U.media.currentTime%60),U.mins=parseInt(U.media.currentTime/60%60),U.secs=("0"+U.secs).slice(-2),U.mins=("0"+U.mins).slice(-2),U.duration.innerHTML=U.mins+":"+U.secs}function W(e){P(),B(e)}function _(){i(U.buttons.play,"click",function(){C(),setTimeout(function(){U.buttons.pause.focus()},100)}),i(U.buttons.pause,"click",function(){E(),setTimeout(function(){U.buttons.play.focus()},100)}),i(U.buttons.restart,"click",M),i(U.buttons.rewind,"click",A),i(U.buttons.forward,"click",I),i(U.volume,"change input",function(){j(this.value)}),i(U.buttons.mute,"change",function(){q(this.checked)}),i(U.buttons.fullscreen,"click",L),i(document,m.fullScreenEventName,L),"video"===U.type&&b.click&&i(U.videoContainer,"click",function(){U.media.paused?C():U.media.ended?M():E()}),i(U.media,"timeupdate seeking",W),i(U.buttons.seek,"change input",X),i(U.buttons.captions,"click",function(){H(this.checked)}),i(U.media,"ended",function(){"video"===U.type&&(U.captionsContainer.innerHTML=""),V()}),i(U.media,"progress",B),i(U.media,"playing",B),i(U.media,"volumechange",R),i(U.media,"play pause",V)}function D(){return m=p(),U.browserInfo=n(),U.browserName=U.browserInfo[0],U.browserMajorVersion=U.browserInfo[1],t(U.browserName+" "+U.browserMajorVersion),"IE"!==U.browserName||8!==U.browserMajorVersion&&9!==U.browserMajorVersion?(S(),U.random=Math.floor(1e4*Math.random()),x(),w()?(T(),F(),j(),N(),_(),void 0):!1):(t("Browser not suppported.",!0),!1)}var U=this;U.container=e;var X=function(e){var n=0;"undefined"!=typeof e&&("number"==typeof e?n=e:("change"===e.type||"input"===e.type)&&(n=(this.value/this.max*U.media.duration).toFixed(1)),U.media.currentTime=n>U.media.duration?U.media.duration:0>n?0:n,t("Seeking to "+U.media.currentTime+" seconds"),U.isTextTracks||"video"!==U.type||o(U))};return D(),{media:U.media,play:C,pause:E,restart:M,rewind:A,forward:I,seek:X,setVolume:j,toggleMute:q,toggleCaptions:H}}var m,b,v={enabled:!0,debug:!1,seekTime:10,volume:5,click:!0,selectors:{container:".player",controls:".player-controls",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",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},html:function(){return["
","
","","","","0% played","","","0% buffered","","
","","","","","","","","Time","00:00","","","","","","","","","","","","
"].join("\n")}()};e.setup=function(e){if(b=u(v,e),!b.enabled)return!1;for(var t=document.querySelectorAll(b.selectors.container),n=[],s=t.length-1;s>=0;s--){var r=t[s];"undefined"==typeof r.plyr&&(r.plyr=new f(r)),n.push(r.plyr)}return n}}(this.plyr=this.plyr||{}); \ No newline at end of file +!function(e){"use strict";function t(e,t){b.debug&&window.console&&console[t?"error":"log"](e)}function n(){var e,t,n,s=navigator.userAgent,r=navigator.appName,a=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10);return-1!==navigator.appVersion.indexOf("Windows NT")&&-1!==navigator.appVersion.indexOf("rv:11")?(r="IE",a="11;"):-1!==(t=s.indexOf("MSIE"))?(r="IE",a=s.substring(t+5)):-1!==(t=s.indexOf("Chrome"))?(r="Chrome",a=s.substring(t+7)):-1!==(t=s.indexOf("Safari"))?(r="Safari",a=s.substring(t+7),-1!==(t=s.indexOf("Version"))&&(a=s.substring(t+8))):-1!==(t=s.indexOf("Firefox"))?(r="Firefox",a=s.substring(t+8)):(e=s.lastIndexOf(" ")+1)<(t=s.lastIndexOf("/"))&&(r=s.substring(e,t),a=s.substring(t+1),r.toLowerCase()==r.toUpperCase()&&(r=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)),[r,o]}function s(e,t,n){return e.replace(new RegExp(t.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),n)}function r(e,t){e.length||(e=[e]);for(var n=e.length-1;n>=0;n--){var s=n>0?t.cloneNode(!0):t,r=e[n],a=r.parentNode,o=r.nextSibling;s.appendChild(r),o?a.insertBefore(s,o):a.appendChild(s)}}function a(e,t,n){if(e)if(e.classList)e.classList[n?"add":"remove"](t);else{var s=(" "+e.className+" ").replace(/\s+/g," ").replace(" "+t+" ","");e.className=s+(n?" "+t:"")}}function o(e,t,n,s){t=t.split(" ");for(var r=0;rn;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 d(){var e={supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}()};return e}function f(e){function o(){for(U.subcount=0;v(U.captions[U.subcount][0])U.captions.length-1){U.subcount=U.captions.length-1;break}}function u(){a(U.container,b.classes.captions.enabled,!0),b.captions.defaultActive&&(a(U.container,b.classes.captions.active,!0),U.buttons.captions.setAttribute("checked","checked"))}function f(e){var t=[];return t=e.split(" --> "),g(t[0])}function v(e){var t=[];return t=e.split(" --> "),g(t[1])}function g(e){if(null===e||void 0===e)return 0;var t,n=[],s=[];return n=e.split(","),s=n[0].split(":"),t=Math.floor(60*s[0]*60)+Math.floor(60*s[1])+Math.floor(s[2])}function y(e){return U.container.querySelectorAll(e)}function h(e){return y(e)[0]}function k(){try{return window.self!==window.top}catch(e){return!0}}function x(){t("Injecting custom controls.");var e=b.html;e=s(e,"{seektime}",b.seekTime),e=s(e,"{id}",U.random),U.container.insertAdjacentHTML("beforeend",e)}function w(){try{return U.controls=h(b.selectors.controls),U.buttons={},U.buttons.seek=h(b.selectors.buttons.seek),U.buttons.play=h(b.selectors.buttons.play),U.buttons.pause=h(b.selectors.buttons.pause),U.buttons.restart=h(b.selectors.buttons.restart),U.buttons.rewind=h(b.selectors.buttons.rewind),U.buttons.forward=h(b.selectors.buttons.forward),U.buttons.mute=h(b.selectors.buttons.mute),U.buttons.captions=h(b.selectors.buttons.captions),U.buttons.fullscreen=h(b.selectors.buttons.fullscreen),U.progress={},U.progress.container=h(b.selectors.progress.container),U.progress.buffer={},U.progress.buffer.bar=h(b.selectors.progress.buffer),U.progress.buffer.text=U.progress.buffer.bar.getElementsByTagName("span")[0],U.progress.played={},U.progress.played.bar=h(b.selectors.progress.played),U.progress.played.text=U.progress.played.bar.getElementsByTagName("span")[0],U.volume=h(b.selectors.buttons.volume),U.duration=h(b.selectors.duration),U.seekTime=y(b.selectors.seekTime),!0}catch(e){return t("It looks like there's a problem with your controls html. Bailing.",!0),!1}}function T(){var e=U.buttons.play.innerText||"Play";"undefined"!=typeof b.title&&b.title.length&&(e+=", "+b.title),U.buttons.play.setAttribute("aria-label",e)}function S(){if(U.media=U.container.querySelectorAll("audio, video")[0],!U.media)return t("No audio or video element found!",!0),!1;if(U.media.removeAttribute("controls"),U.type="video"==U.media.tagName.toLowerCase()?"video":"audio",a(U.container,b.classes[U.type],!0),a(U.container,b.classes.stopped,null===U.media.getAttribute("autoplay")),"video"===U.type){var e=document.createElement("div");e.setAttribute("class",b.classes.videoWrapper),r(U.media,e),U.videoContainer=e}}function F(){if("video"===U.type){U.videoContainer.insertAdjacentHTML("afterbegin","
"),U.captionsContainer=h(b.selectors.captions),U.isTextTracks=!1,U.media.textTracks&&(U.isTextTracks=!0);for(var e,n="",s=U.media.childNodes,r=0;r=31||"Safari"===U.browserName&&U.browserMajorVersion>=7)&&(t("Detected IE 10/11 or Firefox 31+ or Safari 7+."),U.isTextTracks=!1),U.isTextTracks){t("TextTracks supported.");for(var c=0;cf(U.captions[U.subcount][0])&&U.media.currentTime.toFixed(1)v(U.captions[U.subcount][0])&&U.subcount=7){t("Safari 7+ detected; removing track from DOM."),o=U.media.getElementsByTagName("track");for(var m=0;m10&&(e=10),U.volume.value=e,U.media.volume=parseFloat(e/10),R(),b.storage.enabled&&d().supported&&(window.localStorage.plyr_volume=e)}function q(e){"undefined"==typeof active&&(e=!U.media.muted,U.buttons.mute.checked=e),U.media.muted=e,R()}function H(e){"undefined"==typeof e&&(e=-1===U.container.className.indexOf(b.classes.captions.active),U.buttons.captions.checked=e),e?a(U.container,b.classes.captions.active,!0):a(U.container,b.classes.captions.active)}function R(){a(U.container,b.classes.muted,0===U.media.volume||U.media.muted)}function B(e){var t,n,s=0;switch(e.type){case"timeupdate":case"seeking":t=U.progress.played.bar,n=U.progress.played.text,s=c(U.media.currentTime,U.media.duration),"timeupdate"==e.type&&(U.buttons.seek.value=s);break;case"change":case"input":t=U.progress.played.bar,n=U.progress.played.text,s=e.target.value;break;case"playing":case"progress":t=U.progress.buffer.bar,n=U.progress.buffer.text,s=function(){var e=U.media.buffered;return e.length?c(e.end(0),U.media.duration):0}()}t&&s>0&&(t.value=s,n.innerHTML=s)}function P(){U.secs=parseInt(U.media.currentTime%60),U.mins=parseInt(U.media.currentTime/60%60),U.secs=("0"+U.secs).slice(-2),U.mins=("0"+U.mins).slice(-2),U.duration.innerHTML=U.mins+":"+U.secs}function W(e){P(),B(e)}function _(){i(U.buttons.play,"click",function(){C(),setTimeout(function(){U.buttons.pause.focus()},100)}),i(U.buttons.pause,"click",function(){E(),setTimeout(function(){U.buttons.play.focus()},100)}),i(U.buttons.restart,"click",M),i(U.buttons.rewind,"click",A),i(U.buttons.forward,"click",I),i(U.volume,"change input",function(){j(this.value)}),i(U.buttons.mute,"change",function(){q(this.checked)}),i(U.buttons.fullscreen,"click",L),i(document,m.fullScreenEventName,L),"video"===U.type&&b.click&&i(U.videoContainer,"click",function(){U.media.paused?C():U.media.ended?M():E()}),i(U.media,"timeupdate seeking",W),i(U.buttons.seek,"change input",X),i(U.buttons.captions,"click",function(){H(this.checked)}),i(U.media,"ended",function(){"video"===U.type&&(U.captionsContainer.innerHTML=""),V()}),i(U.media,"progress",B),i(U.media,"playing",B),i(U.media,"volumechange",R),i(U.media,"play pause",V)}function D(){return m=p(),U.browserInfo=n(),U.browserName=U.browserInfo[0],U.browserMajorVersion=U.browserInfo[1],t(U.browserName+" "+U.browserMajorVersion),"IE"!==U.browserName||8!==U.browserMajorVersion&&9!==U.browserMajorVersion?(S(),U.random=Math.floor(1e4*Math.random()),x(),w()?(T(),F(),j(),N(),_(),void 0):!1):(t("Browser not suppported.",!0),!1)}var U=this;U.container=e;var X=function(e){var n=0;"undefined"!=typeof e&&("number"==typeof e?n=e:("change"===e.type||"input"===e.type)&&(n=(this.value/this.max*U.media.duration).toFixed(1)),U.media.currentTime=n,t("Seeking to "+U.media.currentTime+" seconds"),U.isTextTracks||"video"!==U.type||o(U))};return D(),{media:U.media,play:C,pause:E,restart:M,rewind:A,forward:I,seek:X,setVolume:j,toggleMute:q,toggleCaptions:H}}var m,b,v={enabled:!0,debug:!1,seekTime:10,volume:5,click:!0,selectors:{container:".player",controls:".player-controls",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",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},html:function(){return["
","
","","","","0% played","","","0% buffered","","
","","","","","","","","Time","00:00","","","","","","","","","","","","
"].join("\n")}()};e.setup=function(e){if(b=u(v,e),!b.enabled)return!1;for(var t=document.querySelectorAll(b.selectors.container),n=[],s=t.length-1;s>=0;s--){var r=t[s];"undefined"==typeof r.plyr&&(r.plyr=new f(r)),n.push(r.plyr)}return n}}(this.plyr=this.plyr||{}); \ No newline at end of file diff --git a/readme.md b/readme.md index 489bd0e2..a14a4c81 100644 --- a/readme.md +++ b/readme.md @@ -17,16 +17,20 @@ We wanted a lightweight, accessible and customisable media player that just supp - **Audio & Video** - support for both formats. - **API** - toggle playback, volume, seeking, and more. - **Fullscreen** - supports native fullscreen with fallback to "full window" modes. -- **No dependencies** - written in vanilla JavaScript, no jQuery required. +- **No dependencies** - written in vanilla JavaScript, no jQuery required. + +Oh and yes, it works with Bootstrap. ## Changelog Check out [the changelog](changelog.md) ## Planned development - Accept a string selector, a node, or a nodelist for the `container` property of `selectors`. -- Accept a selector for the `html` template property. - Multiple language captions (with selection) -- Localisation of control labels +- Playlists (audio and video) +- Set source by API +- Tooltip option (for seeking and controls) +... and whatever else has been raised in [issues](https://github.com/Selz/plyr/issues) If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or of course, forking and sending a pull request. diff --git a/src/js/plyr.js b/src/js/plyr.js index 6dfe29bc..b16eb021 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -70,66 +70,68 @@ enabled: true }, html: (function() { - return ["
", - "
", - "", - "", - "", - "0% played", - "", - "", - "0% buffered", - "", - "
", - "", - "", - "", - "", - "", - "", - "", - "Time", - "00:00", + return [ + "
", + "
", + "", + "", + "", + "0% played", + "", + "", + "0% buffered", + "", + "
", + "", + "", + "", + "", + "", + "", + "", + "Time", + "00:00", + "", "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "
"].join("\n"); - })() + "", + "", + "", + "", + "", + "", + "", + "", + "", + "
" + ].join("\n"); + })() }; // Debugging @@ -813,16 +815,8 @@ targetTime = ((this.value / this.max) * player.media.duration).toFixed(1); } - // Handle min and max values - if (targetTime > player.media.duration) { - player.media.currentTime = player.media.duration; - } - else if (targetTime < 0) { - player.media.currentTime = 0; - } - else { - player.media.currentTime = targetTime; - } + // Set the current time + player.media.currentTime = targetTime; // Logging _log("Seeking to " + player.media.currentTime + " seconds"); @@ -1079,22 +1073,6 @@ // Time change on media _on(player.media, "timeupdate seeking", _timeUpdate); - // Pause and resume while seeking - /*_on(player.media, "seeking", function() { - if(!player.media.paused && !player.seekPaused) { - player.seekPaused = true; - _pause(); - } - _log("Seeking") - }); - _on(player.media, "seeked", function() { - if(player.seekPaused) { - player.seekPaused = false; - _play(); - } - _log("Seeked") - });*/ - // Seek _on(player.buttons.seek, "change input", _seek);