From bcf88cd0241f01f37c3d62da21a8715f883fa8b5 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 16 May 2017 10:08:59 +1000 Subject: [PATCH 01/23] Vimeo demo bug fix + repo move --- .github/pull_request_template.md | 8 +++--- changelog.md | 4 +-- demo/dist/demo.js | 2 +- demo/index.html | 4 +-- demo/src/js/main.js | 4 +-- dist/plyr.js | 2 +- license.md | 2 +- notes.md | 43 ++++++++++++++++++++++++++++++++ package.json | 8 +++--- readme.md | 42 +++++++++++++++---------------- src/js/plyr.js | 22 ++++++++-------- 11 files changed, 92 insertions(+), 49 deletions(-) create mode 100644 notes.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f1ad850d..c4779d3c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,8 +1,8 @@ -### Link to related issue (if applicable) +### Link to related issue (if applicable) -### Sumary of proposed changes +### Sumary of proposed changes ### Task list -- [ ] Tested on [supported browsers](https://github.com/Selz/plyr#browser-support) -- [ ] Gulp build completed \ No newline at end of file +- [ ] Tested on [supported browsers](https://github.com/sampotts/plyr#browser-support) +- [ ] Gulp build completed \ No newline at end of file diff --git a/changelog.md b/changelog.md index 1fc85a42..46547433 100644 --- a/changelog.md +++ b/changelog.md @@ -1,8 +1,8 @@ # Changelog ## v2.0.12 -- Ability to set custom `blankUrl` for source changes (https://github.com/Selz/plyr/pull/504) -- Ability to set caption button listener (https://github.com/Selz/plyr/pull/468) +- Ability to set custom `blankUrl` for source changes (https://github.com/sampotts/plyr/pull/504) +- Ability to set caption button listener (https://github.com/sampotts/plyr/pull/468) ## v2.0.11 - Fix for `cleanUp` being called twice (thanks to @sebastiancarlsson) diff --git a/demo/dist/demo.js b/demo/dist/demo.js index 3ecf85aa..e21530ec 100644 --- a/demo/dist/demo.js +++ b/demo/dist/demo.js @@ -1 +1 @@ -"document"in self&&("classList"in document.createElement("_")?!function(){"use strict";var e=document.createElement("_");if(e.classList.add("c1","c2"),!e.classList.contains("c2")){var t=function(e){var t=DOMTokenList.prototype[e];DOMTokenList.prototype[e]=function(e){var i,s=arguments.length;for(i=0;i=0;a--)e(o[a].parentElement,"active",!1);e(document.querySelector('[data-source="'+t+'"]').parentElement,"active",!0)}}var i=plyr.setup({debug:!0,title:"Video demo",iconUrl:"../dist/plyr.svg",tooltips:{controls:!0},captions:{defaultActive:!0}});plyr.loadSprite("dist/demo.svg");for(var s=i[0],o=document.querySelectorAll("[data-source]"),n={video:"video",audio:"audio",youtube:"youtube",vimeo:"vimeo"},r=window.location.hash.replace("#",""),a=window.history&&window.history.pushState,c=o.length-1;c>=0;c--)o[c].addEventListener("click",function(){var e=this.getAttribute("data-source");t(e),a&&history.pushState({type:e},"","#"+e)});if(window.addEventListener("popstate",function(e){e.state&&"type"in e.state&&t(e.state.type)}),a){var l=!r.length;l&&(r=n.video),r in n&&history.replaceState({type:r},"",l?"":"#"+r),r!==n.video&&t(r,!0)}}(),document.domain.indexOf("plyr.io")>-1&&(!function(e,t,i,s,o,n,r){e.GoogleAnalyticsObject=o,e[o]=e[o]||function(){(e[o].q=e[o].q||[]).push(arguments)},e[o].l=1*new Date,n=t.createElement(i),r=t.getElementsByTagName(i)[0],n.async=1,n.src=s,r.parentNode.insertBefore(n,r)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create","UA-40881672-11","auto"),ga("send","pageview")); \ No newline at end of file +"document"in self&&("classList"in document.createElement("_")?!function(){"use strict";var e=document.createElement("_");if(e.classList.add("c1","c2"),!e.classList.contains("c2")){var t=function(e){var t=DOMTokenList.prototype[e];DOMTokenList.prototype[e]=function(e){var i,s=arguments.length;for(i=0;i=0;a--)e(o[a].parentElement,"active",!1);e(document.querySelector('[data-source="'+t+'"]').parentElement,"active",!0)}}var i=plyr.setup({debug:!0,title:"Video demo",iconUrl:"../dist/plyr.svg",tooltips:{controls:!0},captions:{defaultActive:!0}});plyr.loadSprite("dist/demo.svg");for(var s=i[0],o=document.querySelectorAll("[data-source]"),n={video:"video",audio:"audio",youtube:"youtube",vimeo:"vimeo"},r=window.location.hash.replace("#",""),a=window.history&&window.history.pushState,c=o.length-1;c>=0;c--)o[c].addEventListener("click",function(){var e=this.getAttribute("data-source");t(e),a&&history.pushState({type:e},"","#"+e)});if(window.addEventListener("popstate",function(e){e.state&&"type"in e.state&&t(e.state.type)}),a){var l=!r.length;l&&(r=n.video),r in n&&history.replaceState({type:r},"",l?"":"#"+r),r!==n.video&&t(r,!0)}}(),document.domain.indexOf("plyr.io")>-1&&(!function(e,t,i,s,o,n,r){e.GoogleAnalyticsObject=o,e[o]=e[o]||function(){(e[o].q=e[o].q||[]).push(arguments)},e[o].l=1*new Date,n=t.createElement(i),r=t.getElementsByTagName(i)[0],n.async=1,n.src=s,r.parentNode.insertBefore(n,r)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create","UA-40881672-11","auto"),ga("send","pageview")); \ No newline at end of file diff --git a/demo/index.html b/demo/index.html index 4482ed7d..d412dc2c 100644 --- a/demo/index.html +++ b/demo/index.html @@ -16,11 +16,11 @@

Plyr

-

A simple, accessible HTML5 media player by @sam_potts from @selz

+

A simple, accessible HTML5 media player by @sam_potts