diff --git a/bower.json b/bower.json index 7262919a..80104705 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,6 @@ { "name": "plyr", + "version": "1.0.10", "description": "A simple HTML5 media player using custom controls", "homepage": "http://plyr.io", "keywords": [ @@ -14,7 +15,10 @@ "dependencies": {}, "main": [ "dist/css/plyr.css", - "dist/js/plyr.js" + "dist/js/plyr.js", + "dist/sprite.svg", + "src/less/plyr.less", + "src/js/plyr.js" ], "ignore": [ "node_modules", diff --git a/bundles.json b/bundles.json index e654fee0..ab92813c 100644 --- a/bundles.json +++ b/bundles.json @@ -1,14 +1,14 @@ { "less": { - "plyr.css": ["assets/less/plyr.less"], - "docs.css": ["assets/less/docs.less"] + "plyr.css": ["src/less/plyr.less"], + "docs.css": ["src/less/docs.less"] }, "js": { - "plyr.js": ["assets/js/plyr.js"], + "plyr.js": ["src/js/plyr.js"], "docs.js": [ - "assets/js/lib/hogan-3.0.2.mustache.js", + "src/js/lib/hogan-3.0.2.mustache.js", "dist/js/templates.js", - "assets/js/docs.js" + "src/js/docs.js" ] } } \ No newline at end of file diff --git a/dist/js/plyr.js b/dist/js/plyr.js index bb3b648c..41694ad0 100644 --- a/dist/js/plyr.js +++ b/dist/js/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,r=navigator.userAgent,a=navigator.appName,s=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10);return-1!==navigator.appVersion.indexOf("Windows NT")&&-1!==navigator.appVersion.indexOf("rv:11")?(a="IE",s="11;"):-1!==(t=r.indexOf("MSIE"))?(a="IE",s=r.substring(t+5)):-1!==(t=r.indexOf("Chrome"))?(a="Chrome",s=r.substring(t+7)):-1!==(t=r.indexOf("Safari"))?(a="Safari",s=r.substring(t+7),-1!==(t=r.indexOf("Version"))&&(s=r.substring(t+8))):-1!==(t=r.indexOf("Firefox"))?(a="Firefox",s=r.substring(t+8)):(e=r.lastIndexOf(" ")+1)<(t=r.lastIndexOf("/"))&&(a=r.substring(e,t),s=r.substring(t+1),a.toLowerCase()==a.toUpperCase()&&(a=navigator.appName)),-1!==(n=s.indexOf(";"))&&(s=s.substring(0,n)),-1!==(n=s.indexOf(" "))&&(s=s.substring(0,n)),o=parseInt(""+s,10),isNaN(o)&&(s=""+parseFloat(navigator.appVersion),o=parseInt(navigator.appVersion,10)),[a,o]}function r(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,a=e[n],s=a.parentNode,o=a.nextSibling;r.appendChild(a),o?s.insertBefore(r,o):s.appendChild(r)}}function s(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 o(e,t,n){e.addEventListener(t,n,!1)}function i(e,t,n){e.removeEventListener(t,n,!1)}function c(e,t){return Math.floor(e/t*100)}function l(e){var t=d().isFullScreen()?{x:0,y:0}:u(e.currentTarget);return{x:e.clientX-t.x,y:e.clientY-t.y}}function u(e){for(var t=0,n=0;e;)t+=e.offsetLeft-e.scrollLeft+e.clientLeft,n+=e.offsetTop-e.scrollTop+e.clientTop,e=e.offsetParent;return{x:t,y:n}}function p(e,t){for(var n in t)t[n]&&t[n].constructor&&t[n].constructor===Object?(e[n]=e[n]||{},p(e[n],t[n])):e[n]=t[n];return e}function d(){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 f(e){function u(){for(_.subcount=0;v(_.captions[_.subcount][0])<_.media.currentTime.toFixed(1);)if(_.subcount++,_.subcount>_.captions.length-1){_.subcount=_.captions.length-1;break}}function p(){s(_.container,b.classes.captions.enabled,!0),b.captions.defaultActive&&(s(_.container,b.classes.captions.active,!0),_.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=[],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 y(e){return _.container.querySelectorAll(e)}function h(e){return y(e)[0]}function x(){try{return window.self!==window.top}catch(e){return!0}}function k(){t("Injecting custom controls");var e=b.html;e=r(e,"{aria-label}",b.playAriaLabel),e=r(e,"{id}",_.random),_.container.insertAdjacentHTML("beforeend",e)}function w(){try{return _.controls=h(b.selectors.controls),_.buttons={},_.buttons.play=h(b.selectors.buttons.play),_.buttons.pause=h(b.selectors.buttons.pause),_.buttons.restart=h(b.selectors.buttons.restart),_.buttons.rewind=h(b.selectors.buttons.rewind),_.buttons.forward=h(b.selectors.buttons.forward),_.buttons.mute=h(b.selectors.buttons.mute),_.buttons.captions=h(b.selectors.buttons.captions),_.buttons.fullscreen=h(b.selectors.buttons.fullscreen),_.progress={},_.progress.container=h(b.selectors.progress.container),_.progress.buffer={},_.progress.buffer.bar=h(b.selectors.progress.buffer),_.progress.buffer.text=_.progress.buffer.bar.getElementsByTagName("span")[0],_.progress.played={},_.progress.played.bar=h(b.selectors.progress.played),_.progress.played.text=_.progress.played.bar.getElementsByTagName("span")[0],_.volume=h(b.selectors.buttons.volume),_.duration=h(b.selectors.duration),_.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(){if(_.media=_.container.querySelectorAll("audio, video")[0],!_.media)return t("No audio or video element found!",!0),!1;if(_.media.removeAttribute("controls"),_.type="video"==_.media.tagName.toLowerCase()?"video":"audio",s(_.container,b.classes[_.type],!0),s(_.container,b.classes.stopped,null===_.media.getAttribute("autoplay")),"video"===_.type){var e=document.createElement("div");e.setAttribute("class",b.classes.videoWrapper),a(_.media,e),_.videoContainer=e}}function S(){if("video"===_.type){_.videoContainer.insertAdjacentHTML("afterbegin","
"),_.captionsContainer=h(b.selectors.captions),_.isTextTracks=!1,_.media.textTracks&&(_.isTextTracks=!0);for(var e,n="",r=_.media.childNodes,a=0;a=31||"Safari"===_.browserName&&_.browserMajorVersion>=7)&&(t("Detected IE 10/11 or Firefox 31+ or Safari 7+"),_.isTextTracks=!1),_.isTextTracks){t("textTracks supported");for(var l=0;lf(_.captions[_.subcount][0])&&_.media.currentTime.toFixed(1)v(_.captions[_.subcount][0])&&_.subcount<_.captions.length-1&&_.subcount++,_.captionsContainer.innerHTML=_.currentCaption}),""!==n){var d=new XMLHttpRequest;d.onreadystatechange=function(){if(4===d.readyState)if(200===d.status){var e,n=[],r=d.responseText;n=r.split("\n\n");for(var a=0;a=7){t("Safari 7+ detected; removing track from DOM"),i=_.media.getElementsByTagName("track");for(var m=0;mt?0:t,_.isTextTracks||"video"!==_.type||u(_)}function L(e){"undefined"==typeof e&&(e=b.seekInterval);var t=_.media.currentTime+e;_.media.currentTime=t>_.media.duration?_.media.duration:t,_.isTextTracks||"video"!==_.type||u(_)}function A(){var e=m.supportsFullScreen;event.type===m.fullScreenEventName?b.fullscreen.active=m.isFullScreen():e?(m.isFullScreen()?m.cancelFullScreen():m.requestFullScreen(_.container),b.fullscreen.active=m.isFullScreen()):(b.fullscreen.active=!b.fullscreen.active,b.fullscreen.active?(o(document,"keyup",V),document.body.style.overflow="hidden"):(i(document,"keyup",V),document.body.style.overflow="")),s(_.container,b.classes.fullscreen.active,b.fullscreen.active)}function V(e){27===(e.which||e.charCode||e.keyCode)&&b.fullscreen.active&&A()}function O(e){"undefined"==typeof e&&(e=b.storage.enabled&&b.storage.supported?window.localStorage.plyr_volume||b.volume:b.volume),e>10&&(e=10),_.volume.value=e,_.media.volume=parseFloat(e/10),H(),b.storage.enabled&&b.storage.supported&&(window.localStorage.plyr_volume=e)}function j(e){"undefined"==typeof active&&(e=!_.media.muted,_.buttons.mute.checked=e),_.media.muted=e,H()}function q(e){"undefined"==typeof e&&(e=-1===_.container.className.indexOf(b.classes.captions.active),_.buttons.captions.checked=e),e?s(_.container,b.classes.captions.active,!0):s(_.container,b.classes.captions.active)}function H(){s(_.container,b.classes.muted,0===_.media.volume||_.media.muted)}function B(e){var t,n,r=0;switch(e.type){case"timeupdate":t=_.progress.played.bar,n=_.progress.played.text,r=c(_.media.currentTime,_.media.duration);break;case"playing":case"progress":t=_.progress.buffer.bar,n=_.progress.buffer.text,r=function(){var e=_.media.buffered;return e.length?c(e.end(0),_.media.duration):0}()}t&&r>0&&(t.value=r,n.innerHTML=r)}function R(){_.secs=parseInt(_.media.currentTime%60),_.mins=parseInt(_.media.currentTime/60%60),_.secs=("0"+_.secs).slice(-2),_.mins=("0"+_.mins).slice(-2),_.duration.innerHTML=_.mins+":"+_.secs}function P(){o(_.buttons.play,"click",function(){C(),_.buttons.pause.focus()}),o(_.buttons.pause,"click",function(){I(),_.buttons.play.focus()}),o(_.buttons.restart,"click",M),o(_.buttons.rewind,"click",function(){E(b.seekInterval)}),o(_.buttons.forward,"click",function(){L(b.seekInterval)}),o(_.volume,"change",function(){O(this.value)}),o(_.buttons.mute,"change",function(){j(this.checked)}),o(_.buttons.fullscreen,"click",A),o(document,m.fullScreenEventName,A),"video"===_.type&&b.click&&o(_.videoContainer,"click",function(){_.media.paused?C():_.media.ended?M():I()}),o(_.media,"timeupdate",R),o(_.media,"timeupdate",B),o(_.progress.played.bar,"click",function(e){_.pos=l(e).x/this.offsetWidth,_.media.currentTime=_.pos*_.media.duration,_.isTextTracks||"video"!==_.type||u(_)}),o(_.buttons.captions,"click",function(){q(this.checked)}),o(_.media,"ended",function(){"video"===_.type&&(_.captionsContainer.innerHTML=""),s(_.container,b.classes.stopped,!0),s(_.container,b.classes.playing)}),o(_.media,"loadstart",function(){t("loadstart")}),o(_.media,"progress",B),o(_.media,"playing",B)}function W(){return m=d(),_.browserInfo=n(),_.browserName=_.browserInfo[0],_.browserMajorVersion=_.browserInfo[1],t(_.browserName+" "+_.browserMajorVersion),"IE"!==_.browserName||8!==_.browserMajorVersion&&9!==_.browserMajorVersion?(b.playAriaLabel="undefined"!=typeof b.title&&b.title.length?"Play "+b.title:"Play",T(),_.random=Math.floor(1e4*Math.random()),k(),w()?(S(),O(),N(),F(),P(),void 0):!1):(t("Browser not suppported.",!0),!1)}var _=this;return _.container=e,W(),{media:_.media,play:C,pause:I,restart:M,rewind:E,forward:L,setVolume:O,toggleMute:j,toggleCaptions:q}}var m,b,v={enabled:!0,debug:!1,seekInterval:10,volume:5,click:!0,selectors:{container:".player",controls:".player-controls",buttons:{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",seekTime:".player-seek-time"},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,supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}}};e.setup=function(e){if(b=p(v,e),!b.enabled)return!1;for(var t=document.querySelectorAll(b.selectors.container),n=[],r=t.length-1;r>=0;r--){var a=t[r];"undefined"==typeof a.plyr&&(a.plyr=new f(a)),n.push(a.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,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)),[s,o]}function r(e,t,n){return e.replace(new RegExp(t.replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),n)}function s(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 a(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 o(e,t,n){e.addEventListener(t,n,!1)}function i(e,t,n){e.removeEventListener(t,n,!1)}function c(e,t){return Math.floor(e/t*100)}function l(e){var t=d().isFullScreen()?{x:0,y:0}:u(e.currentTarget);return{x:e.clientX-t.x,y:e.clientY-t.y}}function u(e){for(var t=0,n=0;e;)t+=e.offsetLeft-e.scrollLeft+e.clientLeft,n+=e.offsetTop-e.scrollTop+e.clientTop,e=e.offsetParent;return{x:t,y:n}}function p(e,t){for(var n in t)t[n]&&t[n].constructor&&t[n].constructor===Object?(e[n]=e[n]||{},p(e[n],t[n])):e[n]=t[n];return e}function d(){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 f(e){function u(){for(X.subcount=0;v(X.captions[X.subcount][0])X.captions.length-1){X.subcount=X.captions.length-1;break}}function p(){a(X.container,b.classes.captions.enabled,!0),b.captions.defaultActive&&(a(X.container,b.classes.captions.active,!0),X.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=[],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 y(e){return X.container.querySelectorAll(e)}function h(e){return y(e)[0]}function x(){try{return window.self!==window.top}catch(e){return!0}}function k(){t("Injecting custom controls.");var e=b.html;e=r(e,"{aria-label}",b.playAriaLabel),e=r(e,"{id}",X.random),X.container.insertAdjacentHTML("beforeend",e)}function w(){try{return X.controls=h(b.selectors.controls),X.buttons={},X.buttons.play=h(b.selectors.buttons.play),X.buttons.pause=h(b.selectors.buttons.pause),X.buttons.restart=h(b.selectors.buttons.restart),X.buttons.rewind=h(b.selectors.buttons.rewind),X.buttons.forward=h(b.selectors.buttons.forward),X.buttons.mute=h(b.selectors.buttons.mute),X.buttons.captions=h(b.selectors.buttons.captions),X.buttons.fullscreen=h(b.selectors.buttons.fullscreen),X.progress={},X.progress.container=h(b.selectors.progress.container),X.progress.buffer={},X.progress.buffer.bar=h(b.selectors.progress.buffer),X.progress.buffer.text=X.progress.buffer.bar.getElementsByTagName("span")[0],X.progress.played={},X.progress.played.bar=h(b.selectors.progress.played),X.progress.played.text=X.progress.played.bar.getElementsByTagName("span")[0],X.volume=h(b.selectors.buttons.volume),X.duration=h(b.selectors.duration),X.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(){if(X.media=X.container.querySelectorAll("audio, video")[0],!X.media)return t("No audio or video element found!",!0),!1;if(X.media.removeAttribute("controls"),X.type="video"==X.media.tagName.toLowerCase()?"video":"audio",a(X.container,b.classes[X.type],!0),a(X.container,b.classes.stopped,null===X.media.getAttribute("autoplay")),"video"===X.type){var e=document.createElement("div");e.setAttribute("class",b.classes.videoWrapper),s(X.media,e),X.videoContainer=e}}function S(){if("video"===X.type){X.videoContainer.insertAdjacentHTML("afterbegin","
"),X.captionsContainer=h(b.selectors.captions),X.isTextTracks=!1,X.media.textTracks&&(X.isTextTracks=!0);for(var e,n="",r=X.media.childNodes,s=0;s=31||"Safari"===X.browserName&&X.browserMajorVersion>=7)&&(t("Detected IE 10/11 or Firefox 31+ or Safari 7+."),X.isTextTracks=!1),X.isTextTracks){t("TextTracks supported.");for(var l=0;lf(X.captions[X.subcount][0])&&X.media.currentTime.toFixed(1)v(X.captions[X.subcount][0])&&X.subcount=7){t("Safari 7+ detected; removing track from DOM."),i=X.media.getElementsByTagName("track");for(var m=0;mt?0:t,X.isTextTracks||"video"!==X.type||u(X)}function L(e){"undefined"==typeof e&&(e=b.seekInterval);var t=X.media.currentTime+e;X.media.currentTime=t>X.media.duration?X.media.duration:t,X.isTextTracks||"video"!==X.type||u(X)}function A(){var e=m.supportsFullScreen;event.type===m.fullScreenEventName?b.fullscreen.active=m.isFullScreen():e?(m.isFullScreen()?m.cancelFullScreen():m.requestFullScreen(X.container),b.fullscreen.active=m.isFullScreen()):(b.fullscreen.active=!b.fullscreen.active,b.fullscreen.active?(o(document,"keyup",V),document.body.style.overflow="hidden"):(i(document,"keyup",V),document.body.style.overflow="")),a(X.container,b.classes.fullscreen.active,b.fullscreen.active)}function V(e){27===(e.which||e.charCode||e.keyCode)&&b.fullscreen.active&&A()}function O(e){"undefined"==typeof e&&(e=b.storage.enabled&&b.storage.supported?window.localStorage.plyr_volume||b.volume:b.volume),e>10&&(e=10),X.volume.value=e,X.media.volume=parseFloat(e/10),H(),b.storage.enabled&&b.storage.supported&&(window.localStorage.plyr_volume=e)}function j(e){"undefined"==typeof active&&(e=!X.media.muted,X.buttons.mute.checked=e),X.media.muted=e,H()}function q(e){"undefined"==typeof e&&(e=-1===X.container.className.indexOf(b.classes.captions.active),X.buttons.captions.checked=e),e?a(X.container,b.classes.captions.active,!0):a(X.container,b.classes.captions.active)}function H(){a(X.container,b.classes.muted,0===X.media.volume||X.media.muted)}function B(e){var t,n,r=0;switch(e.type){case"timeupdate":t=X.progress.played.bar,n=X.progress.played.text,r=c(X.media.currentTime,X.media.duration);break;case"playing":case"progress":t=X.progress.buffer.bar,n=X.progress.buffer.text,r=function(){var e=X.media.buffered;return e.length?c(e.end(0),X.media.duration):0}()}t&&r>0&&(t.value=r,n.innerHTML=r)}function R(){X.secs=parseInt(X.media.currentTime%60),X.mins=parseInt(X.media.currentTime/60%60),X.secs=("0"+X.secs).slice(-2),X.mins=("0"+X.mins).slice(-2),X.duration.innerHTML=X.mins+":"+X.secs}function P(){o(X.buttons.play,"click",function(){C(),X.buttons.pause.focus()}),o(X.buttons.pause,"click",function(){I(),X.buttons.play.focus()}),o(X.buttons.restart,"click",M),o(X.buttons.rewind,"click",function(){E(b.seekInterval)}),o(X.buttons.forward,"click",function(){L(b.seekInterval)}),o(X.volume,"change",function(){O(this.value)}),o(X.buttons.mute,"change",function(){j(this.checked)}),o(X.buttons.fullscreen,"click",A),o(document,m.fullScreenEventName,A),"video"===X.type&&b.click&&o(X.videoContainer,"click",function(){X.media.paused?C():X.media.ended?M():I()}),o(X.media,"timeupdate",R),o(X.media,"timeupdate",B),o(X.progress.played.bar,"click",function(e){X.pos=l(e).x/this.offsetWidth,X.media.currentTime=X.pos*X.media.duration,X.isTextTracks||"video"!==X.type||u(X)}),o(X.buttons.captions,"click",function(){q(this.checked)}),o(X.media,"ended",function(){"video"===X.type&&(X.captionsContainer.innerHTML=""),a(X.container,b.classes.stopped,!0),a(X.container,b.classes.playing)}),o(X.media,"progress",B),o(X.media,"playing",B)}function W(){return m=d(),X.browserInfo=n(),X.browserName=X.browserInfo[0],X.browserMajorVersion=X.browserInfo[1],t(X.browserName+" "+X.browserMajorVersion),"IE"!==X.browserName||8!==X.browserMajorVersion&&9!==X.browserMajorVersion?(b.playAriaLabel="undefined"!=typeof b.title&&b.title.length?"Play "+b.title:"Play",T(),X.random=Math.floor(1e4*Math.random()),k(),w()?(S(),O(),N(),F(),P(),void 0):!1):(t("Browser not suppported.",!0),!1)}var X=this;return X.container=e,W(),{media:X.media,play:C,pause:I,restart:M,rewind:E,forward:L,setVolume:O,toggleMute:j,toggleCaptions:q}}var m,b,v={enabled:!0,debug:!1,seekInterval:10,volume:5,click:!0,selectors:{container:".player",controls:".player-controls",buttons:{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",seekTime:".player-seek-time"},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,supported:function(){try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}}}};e.setup=function(e){if(b=p(v,e),!b.enabled)return!1;for(var t=document.querySelectorAll(b.selectors.container),n=[],r=t.length-1;r>=0;r--){var s=t[r];"undefined"==typeof s.plyr&&(s.plyr=new f(s)),n.push(s.plyr)}return n}}(this.plyr=this.plyr||{}); \ No newline at end of file diff --git a/dist/svg/sprite.svg b/dist/sprite.svg similarity index 100% rename from dist/svg/sprite.svg rename to dist/sprite.svg diff --git a/gulpfile.js b/gulpfile.js index 71dad55f..0d1cf8fb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,23 +17,21 @@ var fs = require("fs"), svgmin = require("gulp-svgmin"), hogan = require("gulp-hogan-compile"); -var projectPath = __dirname; -var paths = { - project: projectPath, - +var root = __dirname, + paths = { // Watch paths - watchless: path.join(projectPath, "assets/less/**/*"), - watchjs: path.join(projectPath, "assets/js/**/*"), - watchicons: path.join(projectPath, "assets/icons/**/*"), - watchtemplates: path.join(projectPath, "assets/templates/**/*"), - - // SVG Icons - svg: path.join(projectPath, "assets/icons/*.svg"), - + watch: { + less: path.join(root, "src/less/**/*"), + js: path.join(root, "src/js/**/*"), + sprite: path.join(root, "src/sprite/*.svg"), + templates: path.join(root, "src/templates/*.html"), + }, // Output paths - js: path.join(projectPath, "dist/js/"), - css: path.join(projectPath, "dist/css/"), - icons: path.join(projectPath, "dist/svg/") + output: { + js: path.join(root, "dist/js/"), + css: path.join(root, "dist/css/"), + sprite: path.join(root, "dist/") + } }, // Task names @@ -41,7 +39,7 @@ taskNames = { jsAll: "js-all", lessBuild: "less-", jsBuild: "js-", - iconBuild: "icon-build", + sprite: "sprite-build", templates: "templates" }, // Task arrays @@ -49,7 +47,7 @@ lessBuildTasks = [], jsBuildTasks = [], // Fetch bundles from JSON -bundles = loadJSON(path.join(paths.project, "bundles.json")); +bundles = loadJSON(path.join(root, "bundles.json")); // Load json function loadJSON(path) { @@ -59,14 +57,14 @@ function loadJSON(path) { // Build templates gulp.task(taskNames.templates, function () { return gulp - .src(paths.watchtemplates) + .src(paths.watch.templates) .pipe(hogan("templates.js", { wrapper: false, templateName: function (file) { return path.basename(file.relative.replace(/\\/g, "-"), path.extname(file.relative)); } })) - .pipe(gulp.dest(paths.js)); + .pipe(gulp.dest(paths.output.js)); }); // Process JS @@ -80,7 +78,7 @@ for (var key in bundles.js) { .src(bundles.js[key]) .pipe(concat(key)) .pipe(uglify()) - .pipe(gulp.dest(paths.js)); + .pipe(gulp.dest(paths.output.js)); }); })(key); } @@ -97,32 +95,29 @@ for (var key in bundles.less) { .pipe(less()) .on("error", gutil.log) .pipe(concat(key)) - .pipe(prefix(["last 2 versions", "> 1%", "ie 9"], { cascade: true })) + .pipe(prefix(["last 2 versions"], { cascade: true })) .pipe(minifyCss()) - .pipe(gulp.dest(paths.css)); + .pipe(gulp.dest(paths.output.css)); }); })(key); } // Process Icons -gulp.task(taskNames.iconBuild, function () { +gulp.task(taskNames.sprite, function () { return gulp - .src(paths.svg) + .src(paths.watch.sprite) .pipe(svgmin({ plugins: [{ removeDesc: true }] })) - .pipe(svgstore({ - prefix: "icon-", - fileName: "sprite.svg" - })) - .pipe(gulp.dest(paths.icons)); + .pipe(svgstore()) + .pipe(gulp.dest(paths.output.sprite)); }); // Default gulp task gulp.task("default", function(){ - runSequence(taskNames.jsAll, lessBuildTasks.concat(taskNames.iconBuild, "watch")); + runSequence(taskNames.jsAll, lessBuildTasks.concat(taskNames.sprite, "watch")); }); // Build all JS (inc. templates) @@ -132,8 +127,8 @@ gulp.task(taskNames.jsAll, function(){ // Watch for file changes gulp.task("watch", function () { - //gulp.watch(paths.watchtemplates, [taskNames.jsAll]); - //gulp.watch(paths.watchjs, [taskNames.jsAll]); - gulp.watch(paths.watchless, lessBuildTasks); - gulp.watch(paths.watchicons, [taskNames.iconBuild]); + //gulp.watch(paths.watch.templates, [taskNames.jsAll]); + //gulp.watch(paths.watch.js, [taskNames.jsAll]); + gulp.watch(paths.watch.less, lessBuildTasks); + gulp.watch(paths.watch.sprite, [taskNames.iconBuild]); }); \ No newline at end of file diff --git a/index.html b/index.html index 5593c392..2021cfc5 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,7 @@ - +
@@ -55,7 +55,7 @@ diff --git a/package.json b/package.json index 938dc402..8d3b7b7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plyr", - "version": "1.0.0", + "version": "1.0.10", "description": "A simple HTML5 media player using custom controls", "homepage": "http://plyr.io", "main": "gulpfile.js", @@ -13,7 +13,7 @@ "gulp-less": "~1.3.1", "gulp-minify-css": "~0.3.6", "gulp-svgmin": "^1.0.0", - "gulp-svgstore": "^4.0.1", + "gulp-svgstore": "^5.0.0", "gulp-uglify": "~0.3.1", "gulp-util": "~2.2.20", "run-sequence": "^0.3.6" diff --git a/assets/fonts/AvenirLTStd-Heavy.ttf b/src/fonts/AvenirLTStd-Heavy.ttf similarity index 100% rename from assets/fonts/AvenirLTStd-Heavy.ttf rename to src/fonts/AvenirLTStd-Heavy.ttf diff --git a/assets/fonts/AvenirLTStd-Heavy.woff b/src/fonts/AvenirLTStd-Heavy.woff similarity index 100% rename from assets/fonts/AvenirLTStd-Heavy.woff rename to src/fonts/AvenirLTStd-Heavy.woff diff --git a/assets/fonts/AvenirLTStd-Heavy.woff2 b/src/fonts/AvenirLTStd-Heavy.woff2 similarity index 100% rename from assets/fonts/AvenirLTStd-Heavy.woff2 rename to src/fonts/AvenirLTStd-Heavy.woff2 diff --git a/assets/fonts/AvenirLTStd-Medium.ttf b/src/fonts/AvenirLTStd-Medium.ttf similarity index 100% rename from assets/fonts/AvenirLTStd-Medium.ttf rename to src/fonts/AvenirLTStd-Medium.ttf diff --git a/assets/fonts/AvenirLTStd-Medium.woff b/src/fonts/AvenirLTStd-Medium.woff similarity index 100% rename from assets/fonts/AvenirLTStd-Medium.woff rename to src/fonts/AvenirLTStd-Medium.woff diff --git a/assets/fonts/AvenirLTStd-Medium.woff2 b/src/fonts/AvenirLTStd-Medium.woff2 similarity index 100% rename from assets/fonts/AvenirLTStd-Medium.woff2 rename to src/fonts/AvenirLTStd-Medium.woff2 diff --git a/assets/js/docs.js b/src/js/docs.js similarity index 100% rename from assets/js/docs.js rename to src/js/docs.js diff --git a/assets/js/lib/hogan-3.0.2.mustache.js b/src/js/lib/hogan-3.0.2.mustache.js similarity index 100% rename from assets/js/lib/hogan-3.0.2.mustache.js rename to src/js/lib/hogan-3.0.2.mustache.js diff --git a/assets/js/plyr.js b/src/js/plyr.js similarity index 99% rename from assets/js/plyr.js rename to src/js/plyr.js index 18687d39..c3055a12 100644 --- a/assets/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.0.9 +// plyr.js v1.0.10 // https://github.com/sampotts/plyr // ========================================================================== // Credits: http://paypal.github.io/accessible-html5-video-player/ diff --git a/assets/less/docs.less b/src/less/docs.less similarity index 99% rename from assets/less/docs.less rename to src/less/docs.less index 4c8baa50..65639769 100644 --- a/assets/less/docs.less +++ b/src/less/docs.less @@ -35,7 +35,6 @@ html { body { font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif; background: #fff; - //.font-size(16); line-height: 1.5; text-align: center; color: #6D797F; diff --git a/assets/less/docs/fontface.less b/src/less/docs/fontface.less similarity index 100% rename from assets/less/docs/fontface.less rename to src/less/docs/fontface.less diff --git a/assets/less/docs/mixins.less b/src/less/docs/mixins.less similarity index 100% rename from assets/less/docs/mixins.less rename to src/less/docs/mixins.less diff --git a/assets/less/docs/normalize.less b/src/less/docs/normalize.less similarity index 100% rename from assets/less/docs/normalize.less rename to src/less/docs/normalize.less diff --git a/assets/less/plyr.less b/src/less/plyr.less similarity index 100% rename from assets/less/plyr.less rename to src/less/plyr.less diff --git a/assets/icons/bubble.svg b/src/sprite/icon-bubble.svg similarity index 100% rename from assets/icons/bubble.svg rename to src/sprite/icon-bubble.svg diff --git a/assets/icons/collapse.svg b/src/sprite/icon-collapse.svg similarity index 100% rename from assets/icons/collapse.svg rename to src/sprite/icon-collapse.svg diff --git a/assets/icons/expand.svg b/src/sprite/icon-expand.svg similarity index 100% rename from assets/icons/expand.svg rename to src/sprite/icon-expand.svg diff --git a/assets/icons/fast-forward.svg b/src/sprite/icon-fast-forward.svg similarity index 100% rename from assets/icons/fast-forward.svg rename to src/sprite/icon-fast-forward.svg diff --git a/assets/icons/muted.svg b/src/sprite/icon-muted.svg similarity index 100% rename from assets/icons/muted.svg rename to src/sprite/icon-muted.svg diff --git a/assets/icons/pause.svg b/src/sprite/icon-pause.svg similarity index 100% rename from assets/icons/pause.svg rename to src/sprite/icon-pause.svg diff --git a/assets/icons/play.svg b/src/sprite/icon-play.svg similarity index 100% rename from assets/icons/play.svg rename to src/sprite/icon-play.svg diff --git a/assets/icons/refresh.svg b/src/sprite/icon-refresh.svg similarity index 100% rename from assets/icons/refresh.svg rename to src/sprite/icon-refresh.svg diff --git a/assets/icons/rewind.svg b/src/sprite/icon-rewind.svg similarity index 100% rename from assets/icons/rewind.svg rename to src/sprite/icon-rewind.svg diff --git a/assets/icons/sound.svg b/src/sprite/icon-sound.svg similarity index 100% rename from assets/icons/sound.svg rename to src/sprite/icon-sound.svg diff --git a/assets/templates/controls.html b/src/templates/controls.html similarity index 100% rename from assets/templates/controls.html rename to src/templates/controls.html