CDN URL updates

allow for setting additional listener for captions

.github/issue_template.md

@@ -0,0 +1,28 @@
+<!--- 
+Please use this issue template as it makes replicating and fixing the issue easier! 
+--->
+
+- [ ] Issue does not already exist
+- [ ] Issue observed on https://plyr.io
+
+### Expected behaviour 
+
+### Actual behaviour
+
+### Environment
+
+- Browser:
+- Version:  
+- Operating System:
+- Version: 
+
+Players affected:
+- [ ] HTML5 Video
+- [ ] HTML5 Audio
+- [ ] YouTube
+- [ ] Vimeo
+
+### Steps to reproduce 
+- 
+
+### Relevant links

.github/pull_request_template.md

@@ -0,0 +1,8 @@
+### Link to related issue (if applicable)
+
+### Sumary of proposed changes
+
+### Task list
+
+- [ ] Tested on [supported browsers](https://github.com/sampotts/plyr#browser-support)
+- [ ] Gulp build completed

.jsbeautifyrc

@@ -0,0 +1,11 @@
+{
+    "html": {
+        "allowed_file_extensions": []
+    },
+    "css": {
+        "allowed_file_extensions": []
+    },
+    "js": {
+        "allowed_file_extensions": []
+    }
+}

.jshintrc

@@ -8,11 +8,11 @@
     "node"          : false,
     "rhino"         : false,
     "couch"         : false,
-    "wsh"           : true,   // Windows Scripting Host.
+    "wsh"           : false,   // Windows Scripting Host.
     "jquery"        : false,
 
     // Development.
-    "debug"         : false,  // Allow debugger statements e.g. browser breakpoints.
+    "debug"         : true,  // Allow debugger statements e.g. browser breakpoints.
     "devel"         : true,   // Allow developments statements e.g. `console.log();`.
 
     // ECMAScript 5.
@@ -25,7 +25,7 @@
     "bitwise"       : false,  // Prohibit bitwise operators (&, |, ^, etc.).
     "boss"          : false,  // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
     "curly"         : true,   // Require {} for every new block or scope.
-    "eqeqeq"        : false,  // Require triple equals i.e. `===`.
+    "eqeqeq"        : true,  // Require triple equals i.e. `===`.
     "eqnull"        : false,  // Tolerate use of `== null`.
     "evil"          : false,  // Tolerate use of `eval`.
     "expr"          : false,  // Tolerate `ExpressionStatement` as Programs.

bower.json

@@ -9,13 +9,13 @@
         "HTml5 Video"
     ],
     "authors": [
-        "Sam Potts <me@sampotts.me>"
+        "Sam Potts <sam@potts.es>"
     ],
     "dependencies": {},
     "main": [
         "dist/plyr.css",
         "dist/plyr.js",
-        "dist/sprite.svg",
+        "dist/plyr.svg",
         "src/less/plyr.less",
         "src/scss/plyr.scss",
         "src/js/plyr.js"
@@ -27,7 +27,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "git://github.com/selz/plyr.git"
+        "url": "git://github.com/sampotts/plyr.git"
     },
     "license": "MIT"
 }

changelog.md

@@ -1,17 +1,148 @@
 # Changelog
 
-# v1.8.1
+## v2.0.14
+- CDN URL updates. Sorry, still working on V3 as hard as I can...
+
+## v2.0.13
+- Repo moved and Vimeo demo fix
+
+## v2.0.12
+- 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)
+- Fix for YouTube controls on iPad (fixes #391)
+
+## v2.0.10
+- Added seek event fixes for Vimeo and YouTube (fixes #409)
+- Added support for embed URLs rather than ID only (fixes #345)
+
+## v2.0.9
+- Temporary patch for the YouTube API issues with `getDuration()` (relates to #374)
+
+## v2.0.8
+- Added `isPaused()` API method (thanks to @darrena092)
+- Allowed `.on()` API method to be chainable (thanks to @gurupras) (fixes #357)
+- Improved the "awful" rendering of captions on small screens in fullscreen mode (fixes #390)
+- Fix for Firefox VTT compatibility (thanks to @magourex)
+- Fix for Firefox Developer Edition blank video due to `-webkit-mask-image` issue (fixes #392)
+- Added Issue and PR templates with the aim of reducing duplicate or duff issues
+
+## v2.0.7
+- Fixed `getCurrentTime()` method (fixes #351)
+- Added `getVolume()` , `isMuted()` and `getDuration()` API methods (fixes #346)
+
+## v2.0.6
+- Fixed merge issue with `Updated define to work with AMD imports #326` PR
+- Code formatting
+
+## v2.0.5
+- Fix for Vimeo in IE9 & IE10
+- Fix for HTML5 elements not firing `ready` event
+
+## v2.0.4
+- Fix for Firefox full screen (fixes #343)
+
+## v2.0.3
+- Set 'global' keyboard shortcut option to false as default, added `<textarea>` to editable elements to be ignored
+
+## v2.0.2
+- Added 'global' keyboard shortcut option
+
+## v2.0.1
+- Version bump for NPM (sorry for folks who upgraded to the now deleted v1.9.0 through NPM)
+
+# v2.0.0
+This version contains several potential ***breaking changes***:
+
+- `setup()` has been reverted to pre v1.8.0 behaviour; meaning it will return the *instance* rather than the *element*. This is because the reference to the instance is no longer added to the original element (see below).
+- The reference to the `plyr` instance is now added to the media element rather than original container. This is because if a container with multiple children was passed to `setup()` the references to all instances would have been added to the container, creating issues. I would recommend using the return value from `setup()` or the new `get()` method to access the instance.
+- Players will always be wrapped in their own div now - this makes `setup()` and `destroy()` cleaner. This *may* break any custom styling based on DOM position.
+- Players no longer seek to 0 on 'ended' - this is to fix a bug with Microsoft Edge as it triggers 'ended' on media change for whatever reason. They'll never change ;-)
+
+And some other changes and bug fixes:
+
+- New `get()` method on the global plyr object to get all instances inside a container
+- New API methods:
+	- `getOriginal()` to get the original, *unmodified* element plyr was setup on (`<video>`, `<audio>` or empty `<div>` for YouTube and Vimeo)
+	- `getContainer()` to get the players outer wrapper element
+	- `getMedia()` to get the players media element (`<video>`, `<audio>` or empty `<div>` for YouTube and Vimeo)
+	- `getEmbed()` to access the YouTube or Vimeo API directly
+	- `getType()` to get the type of the player
+	- `isReady()` to determine if an instance has completed setup and necessary APIs are loaded (for YouTube / Vimeo)
+	- `on()` to provide an easy way to listen to events
+	- `stop()` to, you guessed it, stop the player
+- `destroy()` now works correctly for YouTube and Vimeo (fixes #272)
+- New `destroyed` event when `destroy()` has completed (original element is passed as event.target)
+- Default volume is now 10 (max) rather than 5
+- Sprite is only loaded once (fixes #259)
+- Fixes for Vimeo post message bugs on source change or destroy (fixes #318)
+- Save caption state in storage (fixes #311)
+- Added keyboard shortcuts to the current focused player (with `keyboardShortcuts` boolean option to disable) (fixes #309)
+- Fix for captions bug (fixes #332)
+- Change to AMD (fixes #298)
+
+## v1.8.12
+- Vimeo keyboard focus fix (Fixes #317)
+- Fix for Vimeo on basic support devices
+
+## v1.8.11
+- Fix for keyboard navigation on Vimeo (Fixes #317)
+- Fix for bug introduced in v1.8.9 related to additional controls
+- Vimeo API upgrade
+- Fix for YouTube bug introduced in v1.8.9
+- Added support for passing array to .setup() (Fixes #319)
+
+## v1.8.10
+- Fix for seek issues introduced in v1.8.9
+
+## v1.8.9
+- Fix for fullscreen not being defined (Fixes #295)
+- Fix for multiline captions (Fixes #314)
+- Clean up of type checks and fix for `restart()` (Fixes #315)
+- Fix for `MEDIA_ERR_SRC_NOT_SUPPORTED` when calling `.source()` API method
+
+## v1.8.8
+- Added getCurrentTime API method (fixes #292)
+- Fix for !hideControls on touch devices (fixes #303)
+
+## v1.8.7
+- Line height fix
+
+## v1.8.6
+- Reverted font size change
+
+## v1.8.5
+- Fixed overflow issues (fixes #286)
+
+## v1.8.4
+- Fix for large play button on small videos
+
+## v1.8.3
+- Disabled iPad support for YouTube and Vimeo due to iOS limitations with iFrame playback
+- Fixed IE11 icon loading (fixes #269)
+- Updated screenshot (fixes #281)
+- Added WordPress plugin (fixes #239)
+- Added Neos plugin
+- Added HLS, Shaka and dash.js examples (see #235 for more)
+- Improvements for controls hiding and showing on touch devices
+
+## v1.8.2
+- Fixed event bubbling
+
+## v1.8.1
 - Fixed inaccurate log message
 
 # v1.8.0
 - ***(Important)*** `setup()` now returns the element Plyr was setup on rather than the `plyr` object. This means `var player = plyr.setup()[0];` would now be `var player = plyr.setup()[0].plyr;`. This improves support for React and other virtual dom frameworks as mentioned in #254
-- Fixed using a relative URL for `iconUrl` in IE (fixes #269) 
+- Fixed using a relative URL for `iconUrl` in IE (fixes #269)
 
 # v1.7.0
 - SASS cleanup (fixes #265)
 - Docs tidy up to help quick start (fixes #253)
 - Fix for issues with data attribute options passing (fixes #257)
-- ***(Important)*** Removed the requirement for a wrapper div to setup Plyr and removed the dependency on the `plyr` classname as a JS hook. By default it will now look for `<video>`, `<audio>` and `[data-type]` elements. If you are just calling `setup()` with a `<div class="plyr">` you may want to give it a good test after upgrading. You can probably remove the wrapper div. The reason behind this is to make setup easier for newcomers and prevent the styling being used on unsupported players (because the plyr classname was used as a CSS and JS hook - which isn't ideal) 
+- ***(Important)*** Removed the requirement for a wrapper div to setup Plyr and removed the dependency on the `plyr` classname as a JS hook. By default it will now look for `<video>`, `<audio>` and `[data-type]` elements. If you are just calling `setup()` with a `<div class="plyr">` you may want to give it a good test after upgrading. You can probably remove the wrapper div. The reason behind this is to make setup easier for newcomers and prevent the styling being used on unsupported players (because the plyr classname was used as a CSS and JS hook - which isn't ideal)
 - Renamed the 'docs' folder to `demo` to avoid confusion - the readme is the docs after all
 
 ## v1.6.20
@@ -41,7 +172,7 @@
 - Decreased sensitivity and inverted scroll on volume slider (scroll up to increase, down to decrease)
 
 ## v1.6.12
-- Fix for undefined buffer error 
+- Fix for undefined buffer error
 - Add scroll listener on volume slider (PR #227 bty @igoradamenko)
 
 ## v1.6.11
@@ -83,13 +214,13 @@
 - Other minor bug fixes
 
 ## v1.6.1
-- Tooltip changes for accessibility 
+- Tooltip changes for accessibility
 
 ## v1.6.0
 - New, cleaner, UI:
 	- Controls are now overlaid, maintaining the video's ratio and making sizing easier
 	- A large play button can now be overlaid over videos
-	- Default number of control buttons reduced 
+	- Default number of control buttons reduced
 	- New play, pause, rewind and fast forward icons
 	- Flexbox all the things!
 - Tidied up the LESS (and SCSS) as part of the above, variables and mixins in seprate files amking customization and upgrades easier

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;s>i;i++)e=arguments[i],t.call(this,e)}};t("add"),t("remove")}if(e.classList.toggle("c3",!1),e.classList.contains("c3")){var i=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(e,t){return 1 in arguments&&!this.contains(e)==!t?t:i.call(this,e)}}e=null}():!function(e){"use strict";if("Element"in e){var t="classList",i="prototype",s=e.Element[i],o=Object,n=String[i].trim||function(){return this.replace(/^\s+|\s+$/g,"")},r=Array[i].indexOf||function(e){for(var t=0,i=this.length;i>t;t++)if(t in this&&this[t]===e)return t;return-1},a=function(e,t){this.name=e,this.code=DOMException[e],this.message=t},c=function(e,t){if(""===t)throw new a("SYNTAX_ERR","An invalid or illegal string was specified");if(/\s/.test(t))throw new a("INVALID_CHARACTER_ERR","String contains an invalid character");return r.call(e,t)},l=function(e){for(var t=n.call(e.getAttribute("class")||""),i=t?t.split(/\s+/):[],s=0,o=i.length;o>s;s++)this.push(i[s]);this._updateClassName=function(){e.setAttribute("class",this.toString())}},u=l[i]=[],d=function(){return new l(this)};if(a[i]=Error[i],u.item=function(e){return this[e]||null},u.contains=function(e){return e+="",-1!==c(this,e)},u.add=function(){var e,t=arguments,i=0,s=t.length,o=!1;do e=t[i]+"",-1===c(this,e)&&(this.push(e),o=!0);while(++i<s);o&&this._updateClassName()},u.remove=function(){var e,t,i=arguments,s=0,o=i.length,n=!1;do for(e=i[s]+"",t=c(this,e);-1!==t;)this.splice(t,1),n=!0,t=c(this,e);while(++s<o);n&&this._updateClassName()},u.toggle=function(e,t){e+="";var i=this.contains(e),s=i?t!==!0&&"remove":t!==!1&&"add";return s&&this[s](e),t===!0||t===!1?t:!i},u.toString=function(){return this.join(" ")},o.defineProperty){var p={get:d,enumerable:!0,configurable:!0};try{o.defineProperty(s,t,p)}catch(h){-2146823252===h.number&&(p.enumerable=!1,o.defineProperty(s,t,p))}}else o[i].__defineGetter__&&s.__defineGetter__(t,d)}}(self)),function(){function e(e,t,i){if(e)if(e.classList)e.classList[i?"add":"remove"](t);else{var s=(" "+e.className+" ").replace(/\s+/g," ").replace(" "+t+" ","");e.className=s+(i?" "+t:"")}}function t(t,i){if(t in n&&(i||t!=r)&&(r.length||t!=n.video)){switch(t){case n.video:s.source({type:"video",title:"View From A Blue Moon",sources:[{src:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4",type:"video/mp4"},{src:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.webm",type:"video/webm"}],poster:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg",tracks:[{kind:"captions",label:"English",srclang:"en",src:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.en.vtt","default":!0}]});break;case n.audio:s.source({type:"audio",title:"Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;",sources:[{src:"https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3",type:"audio/mp3"},{src:"https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg",type:"audio/ogg"}]});break;case n.youtube:s.source({type:"video",title:"View From A Blue Moon",sources:[{src:"bTqVqk7FSmY",type:"youtube"}]});break;case n.vimeo:s.source({type:"video",title:"View From A Blue Moon",sources:[{src:"143418951",type:"vimeo"}]})}r=t;for(var a=o.length-1;a>=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].plyr,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"));
+"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,o=arguments.length;for(i=0;i<o;i++)e=arguments[i],t.call(this,e)}};t("add"),t("remove")}if(e.classList.toggle("c3",!1),e.classList.contains("c3")){var i=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(e,t){return 1 in arguments&&!this.contains(e)==!t?t:i.call(this,e)}}e=null}():function(e){"use strict";if("Element"in e){var t=e.Element.prototype,i=Object,o=String.prototype.trim||function(){return this.replace(/^\s+|\s+$/g,"")},s=Array.prototype.indexOf||function(e){for(var t=0,i=this.length;t<i;t++)if(t in this&&this[t]===e)return t;return-1},n=function(e,t){this.name=e,this.code=DOMException[e],this.message=t},r=function(e,t){if(""===t)throw new n("SYNTAX_ERR","An invalid or illegal string was specified");if(/\s/.test(t))throw new n("INVALID_CHARACTER_ERR","String contains an invalid character");return s.call(e,t)},a=function(e){for(var t=o.call(e.getAttribute("class")||""),i=t?t.split(/\s+/):[],s=0,n=i.length;s<n;s++)this.push(i[s]);this._updateClassName=function(){e.setAttribute("class",this.toString())}},c=a.prototype=[],l=function(){return new a(this)};if(n.prototype=Error.prototype,c.item=function(e){return this[e]||null},c.contains=function(e){return e+="",-1!==r(this,e)},c.add=function(){var e,t=arguments,i=0,o=t.length,s=!1;do{e=t[i]+"",-1===r(this,e)&&(this.push(e),s=!0)}while(++i<o);s&&this._updateClassName()},c.remove=function(){var e,t,i=arguments,o=0,s=i.length,n=!1;do{for(e=i[o]+"",t=r(this,e);-1!==t;)this.splice(t,1),n=!0,t=r(this,e)}while(++o<s);n&&this._updateClassName()},c.toggle=function(e,t){e+="";var i=this.contains(e),o=i?!0!==t&&"remove":!1!==t&&"add";return o&&this[o](e),!0===t||!1===t?t:!i},c.toString=function(){return this.join(" ")},i.defineProperty){var u={get:l,enumerable:!0,configurable:!0};try{i.defineProperty(t,"classList",u)}catch(e){-2146823252===e.number&&(u.enumerable=!1,i.defineProperty(t,"classList",u))}}else i.prototype.__defineGetter__&&t.__defineGetter__("classList",l)}}(self)),function(){function e(e,t,i){if(e)if(e.classList)e.classList[i?"add":"remove"](t);else{var o=(" "+e.className+" ").replace(/\s+/g," ").replace(" "+t+" ","");e.className=o+(i?" "+t:"")}}function t(t,i){if(t in n&&(i||t!==r)&&(r.length||t!==n.video)){switch(t){case n.video:o.source({type:"video",title:"View From A Blue Moon",sources:[{src:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4",type:"video/mp4"},{src:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.webm",type:"video/webm"}],poster:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg",tracks:[{kind:"captions",label:"English",srclang:"en",src:"https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.en.vtt",default:!0}]});break;case n.audio:o.source({type:"audio",title:"Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;",sources:[{src:"https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3",type:"audio/mp3"},{src:"https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg",type:"audio/ogg"}]});break;case n.youtube:o.source({type:"video",title:"View From A Blue Moon",sources:[{src:"bTqVqk7FSmY",type:"youtube"}]});break;case n.vimeo:o.source({type:"video",title:"View From A Blue Moon",sources:[{src:"147865858",type:"vimeo"}]})}r=t;for(var a=s.length-1;a>=0;a--)e(s[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 o=i[0],s=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=s.length-1;c>=0;c--)s[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,o,s,n,r){e.GoogleAnalyticsObject=s,e[s]=e[s]||function(){(e[s].q=e[s].q||[]).push(arguments)},e[s].l=1*new Date,n=t.createElement(i),r=t.getElementsByTagName(i)[0],n.async=1,n.src="//www.google-analytics.com/analytics.js",r.parentNode.insertBefore(n,r)}(window,document,"script",0,"ga"),ga("create","UA-40881672-11","auto"),ga("send","pageview"));

demo/error.html

@@ -6,7 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <!-- Docs styles -->
-        <link rel="stylesheet" href="dist/docs.css">
+        <link rel="stylesheet" href="dist/demo.css">
     </head>
     <body>
         <main>

demo/index.html

@@ -1,88 +1,99 @@
 <!doctype html>
 <html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <title>Plyr - A simple HTML5 media player</title>
-        <meta name="description" content="A simple HTML5 media player with custom controls and WebVTT captions.">
-        <meta name="author" content="Sam Potts">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <!-- Styles -->
-        <link rel="stylesheet" href="../dist/plyr.css">
+<head>
+    <meta charset="utf-8" />
+    <title>Plyr - A simple HTML5 media player</title>
+    <meta name="description" content="A simple HTML5 media player with custom controls and WebVTT captions.">
+    <meta name="author" content="Sam Potts">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <!-- Docs styles -->
-        <link rel="stylesheet" href="dist/demo.css">
-    </head>
-    <body>
-        <header>
-            <h1>Plyr</h1>
-            <p>A simple, accessible HTML5 media player by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a> from <a href="https://twitter.com/selz" target="_blank">@selz</a></p>
-            <nav>
-                <ul>
-                    <li>
-                        <a href="https://github.com/selz/plyr" target="_blank" class="btn btn--large btn--primary" data-shr-network="github">
-                            <svg class="icon"><use xlink:href="#icon-github"/></svg>Download on GitHub
-                        </a>
-                    </li>
-                    <li>
-                        <a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=http%3A%2F%2Fplyr.io&via=Sam_Potts" target="_blank" class="btn btn--large btn--twitter" data-shr-network="twitter">
-                            <svg class="icon"><use xlink:href="#icon-twitter"/></svg>Tweet
-                        </a>
-                    </li>
-                </ul>
-            </nav>
-        </header>
+    <!-- Styles -->
+    <link rel="stylesheet" href="../dist/plyr.css">
 
-        <main role="main" id="main">
-            <nav class="btn__bar">
-                <ul>
-                    <li class="active">
-                        <button type="button" class="btn" data-source="video">Video</button>
-                    </li>
-                    <li>
-                        <button type="button" class="btn" data-source="audio">Audio</button>
-                    </li>
-                    <li>
-                        <button type="button" class="btn btn--youtube" data-source="youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</button>
-                    </li>
-                    <li>
-                        <button type="button" class="btn btn--vimeo" data-source="vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</button>
-                    </li>
-                </ul>
-            </nav>
-            <section>
-                <video poster="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg" controls crossorigin>
-                    <!-- Video files -->
-                    <source src="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4" type="video/mp4">
-                    <source src="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.webm" type="video/webm">
+    <!-- Docs styles -->
+    <link rel="stylesheet" href="dist/demo.css">
+</head>
 
-                    <!-- Text track file -->
-                    <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.en.vtt" default>
+<body>
+    <header>
+        <h1>Plyr</h1>
+        <p>A simple, accessible HTML5 media player by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a></p>
+        <nav>
+            <ul>
+                <li>
+                    <a href="https://github.com/sampotts/plyr" target="_blank" class="btn btn--large btn--primary" data-shr-network="github">
+                        <svg class="icon">
+                            <use xlink:href="#icon-github" />
+                        </svg>Download on GitHub
+                    </a>
+                </li>
+                <li>
+                    <a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=http%3A%2F%2Fplyr.io&via=Sam_Potts"
+                        target="_blank" class="btn btn--large btn--twitter" data-shr-network="twitter">
+                        <svg class="icon">
+                            <use xlink:href="#icon-twitter" />
+                        </svg>Tweet
+                    </a>
+                </li>
+            </ul>
+        </nav>
+    </header>
 
-                    <!-- Fallback for browsers that don't support the <video> element -->
-                    <a href="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4" download>Download</a>
-                </video>
+    <main role="main" id="main">
+        <nav class="btn__bar">
+            <ul>
+                <li class="active">
+                    <button type="button" class="btn" data-source="video">Video</button>
+                </li>
+                <li>
+                    <button type="button" class="btn" data-source="audio">Audio</button>
+                </li>
+                <li>
+                    <button type="button" class="btn btn--youtube" data-source="youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</button>
+                </li>
+                <li>
+                    <button type="button" class="btn btn--vimeo" data-source="vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</button>
+                </li>
+            </ul>
+        </nav>
+        <section>
+            <video poster="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg?v1" controls crossorigin>
+                <!-- Video files -->
+                <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.mp4" type="video/mp4">
+                <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.webm" type="video/webm">
 
-                <ul>
-                    <li class="plyr__cite plyr__cite--video"><small><a href="http://viewfromabluemoon.com/" target="_blank">View From A Blue Moon</a> &copy; Brainfarm</small></li>
-                    <li class="plyr__cite plyr__cite--audio"><small><a href="http://www.kishibashi.com/" target="_blank">Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;</a> &copy; Kishi Bashi</small></li>
-                    <li class="plyr__cite plyr__cite--youtube"><small><a href="https://www.youtube.com/watch?v=bTqVqk7FSmY" target="_blank">View From A Blue Moon</a> on <span class="color--youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</span></small>
-                    <li class="plyr__cite plyr__cite--vimeo"><small><a href="https://vimeo.com/ondemand/viewfromabluemoon4k" target="_blank">View From A Blue Moon</a> on <span class="color--vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</span></small>
-                </ul>
-            </section>
-        </main>
+                <!-- Text track file -->
+                <track kind="captions" label="English" srclang="en" src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt"
+                    default>
 
-        <!-- Plyr core script -->
-        <script src="../dist/plyr.js"></script>
+                <!-- Fallback for browsers that don't support the <video> element -->
+                <a href="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.mp4" download>Download</a>
+            </video>
 
-        <!-- Docs script -->
-        <script src="dist/demo.js"></script>
+            <ul>
+                <li class="plyr__cite plyr__cite--video"><small><a href="http://viewfromabluemoon.com/" target="_blank">View From A Blue Moon</a> &copy; Brainfarm</small></li>
+                <li class="plyr__cite plyr__cite--audio"><small><a href="http://www.kishibashi.com/" target="_blank">Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;</a> &copy; Kishi Bashi</small></li>
+                <li class="plyr__cite plyr__cite--youtube"><small><a href="https://www.youtube.com/watch?v=bTqVqk7FSmY" target="_blank">View From A Blue Moon</a> on <span class="color--youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</span></small></li>
+                <li class="plyr__cite plyr__cite--vimeo"><small><a href="https://vimeo.com/ondemand/viewfromabluemoon4k" target="_blank">View From A Blue Moon</a> on <span class="color--vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</span></small></li>
+            </ul>
+        </section>
+    </main>
 
-        <!-- Rangetouch to fix <input type="range"> on touch devices (see https://rangetouch.com) -->
-        <script src="https://cdn.rangetouch.com/0.0.9/rangetouch.js"></script>
+    <!-- Plyr core script -->
+    <script src="../dist/plyr.js"></script>
 
-        <!-- Sharing libary (https://shr.one) -->
-        <script src="https://cdn.shr.one/0.1.9/shr.js"></script>
-        <script>if(window.shr) { window.shr.setup({ count: { classname: 'btn__count' } }); }</script>
-    </body>
-</html>
+    <!-- Docs script -->
+    <script src="dist/demo.js"></script>
+
+    <!-- Rangetouch to fix <input type="range"> on touch devices (see https://rangetouch.com) -->
+    <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async></script>
+
+    <!-- Sharing libary (https://shr.one) -->
+    <script src="https://cdn.shr.one/1.0.1/shr.js"></script>
+    <script>
+        if (window.shr) { window.shr.setup({ count: { classname: 'btn__count' } }); }
+    </script>
+</body>
+
+</html>

demo/src/js/main.js

@@ -7,77 +7,79 @@
 /*global plyr*/
 
 // General functions
-;(function() {
-	// Setup the player
-	var instances = plyr.setup({
-		debug: 				true,
-		title: 				'Video demo',
-		iconUrl: 			'../dist/plyr.svg',
-		tooltips: 	{
-			controls: 		true
-		},
-		captions: {
-			defaultActive: 	true
-		}
-	});
-	plyr.loadSprite('dist/demo.svg');
+(function() {
+    //document.body.addEventListener('ready', function(event) { console.log(event); });
 
-	// Plyr returns an array regardless
-	var player = instances[0].plyr;
+    // Setup the player
+    var instances = plyr.setup({
+        debug:              true,
+        title:              'Video demo',
+        iconUrl:            '../dist/plyr.svg',
+        tooltips: {
+            controls:       true
+        },
+        captions: {
+            defaultActive:  true
+        }
+    });
+    plyr.loadSprite('dist/demo.svg');
 
-	// Setup type toggle
-	var buttons = document.querySelectorAll('[data-source]'),
-		types = {
-			video: 		'video',
-			audio: 		'audio',
-			youtube: 	'youtube',
-			vimeo: 		'vimeo'
-		},
-		currentType = window.location.hash.replace('#', ''),
-		historySupport = (window.history && window.history.pushState);
+    // Plyr returns an array regardless
+    var player = instances[0];
 
-	// Bind to each button
-	for (var i = buttons.length - 1; i >= 0; i--) {
-		buttons[i].addEventListener('click', function() {
-			var type = this.getAttribute('data-source');
+    // Setup type toggle
+    var buttons = document.querySelectorAll('[data-source]'),
+        types = {
+            video:      'video',
+            audio:      'audio',
+            youtube:    'youtube',
+            vimeo:      'vimeo'
+        },
+        currentType = window.location.hash.replace('#', ''),
+        historySupport = (window.history && window.history.pushState);
 
-			newSource(type);
+    // Bind to each button
+    for (var i = buttons.length - 1; i >= 0; i--) {
+        buttons[i].addEventListener('click', function() {
+            var type = this.getAttribute('data-source');
 
-			if (historySupport) {
-				history.pushState({ 'type': type }, '', '#' + type);
-			}
-		});
-	}
+            newSource(type);
 
-	// List for backwards/forwards
-	window.addEventListener('popstate', function(event) {
-		if(event.state && 'type' in event.state) {
-			newSource(event.state.type);
-		}
-	});
+            if (historySupport) {
+                history.pushState({ 'type': type }, '', '#' + type);
+            }
+        });
+    }
 
-	// On load
-	if(historySupport) {
-		var video = !currentType.length;
+    // List for backwards/forwards
+    window.addEventListener('popstate', function(event) {
+        if(event.state && 'type' in event.state) {
+            newSource(event.state.type);
+        }
+    });
 
-		// If there's no current type set, assume video
-		if(video) {
-			currentType = types.video;
-		}
+    // On load
+    if(historySupport) {
+        var video = !currentType.length;
 
-		// Replace current history state
-		if(currentType in types) {
-			history.replaceState({ 'type': currentType }, '', (video ? '' : '#' + currentType));
-		}
+        // If there's no current type set, assume video
+        if(video) {
+            currentType = types.video;
+        }
 
-		// If it's not video, load the source
-		if(currentType !== types.video) {
-			newSource(currentType, true);
-		}
-	}
+        // Replace current history state
+        if(currentType in types) {
+            history.replaceState({ 'type': currentType }, '', (video ? '' : '#' + currentType));
+        }
 
-	// Toggle class on an element
-	function toggleClass(element, className, state) {
+        // If it's not video, load the source
+        if(currentType !== types.video) {
+            newSource(currentType, true);
+        }
+    }
+
+    // Toggle class on an element
+    function toggleClass(element, className, state) {
         if (element) {
             if (element.classList) {
                 element.classList[state ? 'add' : 'remove'](className);
@@ -89,95 +91,95 @@
         }
     }
 
-	// Set a new source
-	function newSource(type, init) {
-		// Bail if new type isn't known, it's the current type, or current type is empty (video is default) and new type is video
-		if(!(type in types) || (!init && type == currentType) || (!currentType.length && type == types.video)) {
-			return;
-		}
+    // Set a new source
+    function newSource(type, init) {
+        // Bail if new type isn't known, it's the current type, or current type is empty (video is default) and new type is video
+        if(!(type in types) || (!init && type === currentType) || (!currentType.length && type === types.video)) {
+            return;
+        }
 
-		switch(type) {
-			case types.video:
-				player.source({
-					type:       'video',
-					title: 		'View From A Blue Moon',
-					sources: [{
-						src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4',
-						type:   'video/mp4'
-					},
-					{
-						src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.webm',
-						type:   'video/webm'
-					}],
-					poster:     'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg',
-					tracks:     [{
-						kind:   'captions',
-						label:  'English',
-						srclang:'en',
-						src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.en.vtt',
-						default: true
-					}]
-				});
-				break;
+        switch(type) {
+            case types.video:
+                player.source({
+                    type:       'video',
+                    title:      'View From A Blue Moon',
+                    sources: [{
+                        src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4',
+                        type:   'video/mp4'
+                    },
+                    {
+                        src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.webm',
+                        type:   'video/webm'
+                    }],
+                    poster:     'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg',
+                    tracks:     [{
+                        kind:   'captions',
+                        label:  'English',
+                        srclang:'en',
+                        src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.en.vtt',
+                        default: true
+                    }]
+                });
+                break;
 
-			case types.audio:
-				player.source({
-					type:       'audio',
-					title: 		'Kishi Bashi – “It All Began With A Burst”',
-					sources: [{
-						src:    'https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3',
-						type:   'audio/mp3'
-					},
-					{
-						src:    'https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg',
-						type:   'audio/ogg'
-					}]
-				});
-				break;
+            case types.audio:
+                player.source({
+                    type:       'audio',
+                    title:      'Kishi Bashi – “It All Began With A Burst”',
+                    sources: [{
+                        src:    'https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3',
+                        type:   'audio/mp3'
+                    },
+                    {
+                        src:    'https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg',
+                        type:   'audio/ogg'
+                    }]
+                });
+                break;
 
-			case types.youtube:
-				player.source({
-					type:       'video',
-					title: 		'View From A Blue Moon',
-					sources: [{
-				        src:    'bTqVqk7FSmY',
-				        type:   'youtube'
-				    }]
-				});
-				break;
+            case types.youtube:
+                player.source({
+                    type:       'video',
+                    title:      'View From A Blue Moon',
+                    sources: [{
+                        src:    'bTqVqk7FSmY',
+                        type:   'youtube'
+                    }]
+                });
+                break;
 
-			case types.vimeo:
-				player.source({
-					type:       'video',
-					title: 		'View From A Blue Moon',
-					sources: [{
-				        src:    '143418951',
-				        type:   'vimeo'
-				    }]
-				});
-				break;
-		}
+            case types.vimeo:
+                player.source({
+                    type:       'video',
+                    title:      'View From A Blue Moon',
+                    sources: [{
+                        src:    '147865858',
+                        type:   'vimeo'
+                    }]
+                });
+                break;
+        }
 
-		// Set the current type for next time
-		currentType = type;
+        // Set the current type for next time
+        currentType = type;
 
-		// Remove active classes
-		for (var x = buttons.length - 1; x >= 0; x--) {
-			toggleClass(buttons[x].parentElement, 'active', false);
-		}
+        // Remove active classes
+        for (var x = buttons.length - 1; x >= 0; x--) {
+            toggleClass(buttons[x].parentElement, 'active', false);
+        }
 
-		// Set active on parent
-		toggleClass(document.querySelector('[data-source="'+ type +'"]').parentElement, 'active', true);
-	}
+        // Set active on parent
+        toggleClass(document.querySelector('[data-source="'+ type +'"]').parentElement, 'active', true);
+    }
 })();
 
 // Google analytics
 // For demo site (http://[www.]plyr.io) only
 if(document.domain.indexOf('plyr.io') > -1) {
-	(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-40881672-11', 'auto');
-	ga('send', 'pageview');
+    (function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-40881672-11', 'auto');
+    ga('send', 'pageview');
 }

demo/src/less/components/base.less

@@ -39,9 +39,10 @@ header {
 
 // Sections
 section {
-    padding-bottom: @padding-base;
+    max-width: @example-width-video;
+    margin: 0 auto @padding-base;
 
     @media (min-width: @screen-sm) {
-        padding-bottom: (@padding-base * 2);
+        margin-bottom: (@padding-base * 2);
     }
 }

demo/src/less/components/examples.less

@@ -2,11 +2,6 @@
 // Examples
 // ==========================================================================
 
-section {
-    margin: 0 auto @padding-base;
-    max-width: @example-width-video;
-}
-
 // For non supported browsers
 video {
     max-width: 100%;
@@ -21,7 +16,7 @@ video {
 .plyr--audio {
     max-width: @example-width-audio;
 }
-.plyr--video::after {
+.plyr__video-wrapper::after {
     content: "";
     pointer-events: none;
     position: absolute;

demo/src/less/lib/fontface.less

@@ -4,15 +4,15 @@
 
 @font-face {
     font-family: "Avenir";
-    src:    url("//cdn.plyr.io/fonts/avenir-medium.woff2") format("woff2"), 
-            url("//cdn.plyr.io/fonts/avenir-medium.woff") format("woff");
-    font-style:   normal;
-    font-weight:  @font-weight-base;
+    src: url("//cdn.plyr.io/static/fonts/avenir-medium.woff2") format("woff2"),
+        url("//cdn.plyr.io/static/fonts/avenir-medium.woff") format("woff");
+    font-style: normal;
+    font-weight: @font-weight-base;
 }
 @font-face {
     font-family: "Avenir";
-    src:    url("//cdn.plyr.io/fonts/avenir-bold.woff2") format("woff2"), 
-            url("//cdn.plyr.io/fonts/avenir-bold.woff") format("woff");
-    font-style:   normal;
-    font-weight:  @font-weight-bold;
-}
+    src: url("//cdn.plyr.io/static/fonts/avenir-bold.woff2") format("woff2"),
+        url("//cdn.plyr.io/static/fonts/avenir-bold.woff") format("woff");
+    font-style: normal;
+    font-weight: @font-weight-bold;
+}

gulpfile.js

@@ -77,20 +77,20 @@ function loadJSON(path) {
 // Create a file from a string
 // http://stackoverflow.com/questions/23230569/how-do-you-create-a-file-from-a-string-in-gulp
 function createFile(filename, string) {
-    var src = require('stream').Readable({ 
-        objectMode: true 
+    var src = require('stream').Readable({
+        objectMode: true
     });
     src._read = function () {
-        this.push(new gutil.File({ 
-            cwd: "", 
-            base: "", 
-            path: filename, 
+        this.push(new gutil.File({
+            cwd: "",
+            base: "",
+            path: filename,
             contents: new Buffer(string),
             // stats also required for some functions
             // https://nodejs.org/api/fs.html#fs_class_fs_stats
             stat: {
                 size: string.length
-            } 
+            }
         }));
         this.push(null);
     }
@@ -245,15 +245,15 @@ options = {
 // If aws is setup
 if("cdn" in aws) {
     var regex       = "(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-[\\da-z\\-]+(?:\.[\\da-z\\-]+)*)?(?:\\+[\\da-z\\-]+(?:\.[\\da-z\\-]+)*)?",
-    cdnpath         = new RegExp(aws.cdn.bucket + "\/" + regex, "gi"),
+    cdnpath         = new RegExp(aws.cdn.domain + "\/" + regex, "gi"),
     semver          = new RegExp("v" + regex, "gi"),
     localPath       = new RegExp("(\.\.\/)?dist", "gi"),
-    versionPath     = "https://" + aws.cdn.bucket + "/" + version;
+    versionPath     = "https://" + aws.cdn.domain + "/" + version;
 }
 
 // Publish version to CDN bucket
 gulp.task("cdn", function () {
-    console.log("Uploading " + version + " to " + aws.cdn.bucket + "...");
+    console.log("Uploading " + version + " to " + aws.cdn.domain + "...");
 
     // Upload to CDN
     return gulp.src(paths.upload)
@@ -270,17 +270,17 @@ gulp.task("cdn", function () {
 
 // Publish to demo bucket
 gulp.task("demo", function () {
-    console.log("Uploading " + version + " demo to " + aws.demo.bucket + "...");
+    console.log("Uploading " + version + " demo to " + aws.demo.domain + "...");
 
     // Replace versioned files in readme.md
     gulp.src([root + "/readme.md"])
-        .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
+        .pipe(replace(cdnpath, aws.cdn.domain + "/" + version))
         .pipe(gulp.dest(root));
 
     // Replace versioned files in plyr.js
     gulp.src(path.join(root, "src/js/plyr.js"))
         .pipe(replace(semver, "v" + version))
-        .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
+        .pipe(replace(cdnpath, aws.cdn.domain + "/" + version))
         .pipe(gulp.dest(path.join(root, "src/js/")));
 
     // Replace local file paths with remote paths in demo HTML
@@ -320,14 +320,14 @@ gulp.task("symlinks", function () {
 
 // Open the demo site to check it's sweet
 gulp.task("open", function () {
-    console.log("Opening " + aws.demo.bucket + "...");
+    console.log("Opening " + aws.demo.domain + "...");
 
     // A file must be specified or gulp will skip the task
     // Doesn't matter which file since we set the URL above
     // Weird, I know...
     return gulp.src([paths.demo.root + "index.html"])
         .pipe(open("", {
-            url: "http://" + aws.demo.bucket
+            url: "http://" + aws.demo.domain
         }));
 });
 

license.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Selz.com
+Copyright (c) 2017 Sam Potts
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,47 +1,43 @@
 {
-  "name": "plyr",
-  "version": "1.8.1",
-  "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
-  "homepage": "http://plyr.io",
-  "main": "src/js/plyr.js",
-  "dependencies": {},
-  "devDependencies": {
-    "gulp": "^3.9.1",
-    "gulp-autoprefixer": "^3.1.0",
-    "gulp-clean-css": "^2.0.6",
-    "gulp-concat": "^2.3.3",
-    "gulp-less": "^3.0.5",
-    "gulp-open": "^2.0.0",
-    "gulp-rename": "^1.2.0",
-    "gulp-replace": "^0.5.3",
-    "gulp-s3": "^0.3.0",
-    "gulp-sass": "^2.3.1",
-    "gulp-size": "^2.1.0",
-    "gulp-svgmin": "^1.2.2",
-    "gulp-svgstore": "^5.0.5",
-    "gulp-uglify": "^1.5.3",
-    "gulp-util": "^3.0.7",
-    "run-sequence": "^1.1.5",
-    "through2": "^2.0.1"
-  },
-  "keywords": [
-    "HTML5 Video",
-    "HTML5 Audio",
-    "Media Player"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/selz/plyr.git"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/selz/plyr/issues"
-  },
-  "directories": {
-    "doc": "readme.md"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Sam Potts <sam@selz.com>"
+    "name": "plyr",
+    "version": "2.0.14",
+    "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
+    "homepage": "http://plyr.io",
+    "main": "src/js/plyr.js",
+    "dependencies": {},
+    "devDependencies": {
+        "gulp": "^3.9.1",
+        "gulp-autoprefixer": "^3.1.0",
+        "gulp-clean-css": "^2.0.6",
+        "gulp-concat": "^2.3.3",
+        "gulp-less": "^3.0.5",
+        "gulp-open": "^2.0.0",
+        "gulp-rename": "^1.2.0",
+        "gulp-replace": "^0.5.3",
+        "gulp-s3": "^0.3.0",
+        "gulp-sass": "^2.3.1",
+        "gulp-size": "^2.1.0",
+        "gulp-svgmin": "^1.2.2",
+        "gulp-svgstore": "^5.0.5",
+        "gulp-uglify": "^1.5.3",
+        "gulp-util": "^3.0.7",
+        "run-sequence": "^1.1.5",
+        "through2": "^2.0.1"
+    },
+    "keywords": ["HTML5 Video", "HTML5 Audio", "Media Player", "DASH", "Shaka", "WordPress", "HLS"],
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/sampotts/plyr.git"
+    },
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/sampotts/plyr/issues"
+    },
+    "directories": {
+        "doc": "readme.md"
+    },
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "Sam Potts <sam@potts.es>"
 }

src/less/plyr.less

@@ -19,7 +19,7 @@
     position: relative;
     max-width: 100%;
     min-width: 200px;
-    font-family: Avenir, "Avenir Next", "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif;
+    font-family: @plyr-font-family;
     direction: ltr;
 
     & when (@plyr-border-box = true) {
@@ -40,6 +40,11 @@
         }
     }
 
+    // Focus
+    &:focus {
+        outline: 0;
+    }
+
     // Media elements
     video,
     audio {
@@ -56,14 +61,14 @@
         height: (@plyr-range-thumb-height * @plyr-range-thumb-active-scale);
         width: 100%;
         margin: 0;
-        padding: 0; 
+        padding: 0;
         vertical-align: middle;
-        
+
         appearance: none;
         cursor: pointer;
         border: none;
         background: transparent;
-        
+
         // WebKit
         &::-webkit-slider-runnable-track {
             .plyr-range-track();
@@ -81,7 +86,7 @@
         &::-moz-range-thumb {
             .plyr-range-thumb();
         }
-        
+
         // Microsoft
         &::-ms-track {
             height: @plyr-range-track-height;
@@ -99,7 +104,7 @@
         &::-ms-thumb {
             .plyr-range-thumb();
             // For some reason, Edge uses the -webkit margin above
-            margin-top: 0; 
+            margin-top: 0;
         }
         &::-ms-tooltip {
             display: none;
@@ -111,11 +116,11 @@
         }
         &::-moz-focus-outer {
             border: 0;
-        }        
+        }
         &.tab-focus:focus {
             outline-offset: 3px;
         }
-        
+
         // Pressed styles
         &:active {
             &::-webkit-slider-thumb {
@@ -168,16 +173,17 @@
     position: relative;
     background: #000;
     border-radius: inherit;
-
-    // Cleaner radius, also forces iframe radius
-    -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
 }
 
 // Container for embeds
 .plyr__video-embed {
     padding-bottom: 56.25%; /* 16:9 */
     height: 0;
+    border-radius: inherit;
+
+    // Require overflow and z-index to force border-radius
     overflow: hidden;
+    z-index: 0;
 
     iframe {
         position: absolute;
@@ -225,6 +231,8 @@
         border-radius: 2px;
         padding: floor(@plyr-control-spacing / 3) @plyr-control-spacing;
         background: @plyr-captions-bg;
+        box-decoration-break: clone;
+        line-height: 150%;
     }
     span:empty {
         display: none;
@@ -237,12 +245,15 @@
 .plyr--captions-active .plyr__captions {
     display: block;
 }
-.plyr--fullscreen-active .plyr__captions {
-    font-size: @plyr-font-size-captions-large;
-}
 .plyr--hide-controls .plyr__captions {
     transform: translateY(-(@plyr-control-spacing * 1.5));
 }
+// Large captions in full screen on larger screens
+@media (min-width: @plyr-bp-screen-lg) {
+    .plyr--fullscreen-active .plyr__captions {
+        font-size: @plyr-font-size-captions-large;
+    }
+}
 
 // Controls
 // --------------------------------------------------------------
@@ -254,13 +265,10 @@
 // Playback controls
 .plyr__controls {
     display: flex;
-    align-items: center; 
-
+    align-items: center;
     line-height: 1;
     text-align: center;
 
-    transition: opacity .3s ease;
-
     // Spacing
     > button,
     .plyr__progress,
@@ -321,9 +329,10 @@
         }
     }
 }
-// Hide controls 
+// Hide controls
 .plyr--hide-controls .plyr__controls {
     opacity: 0;
+    pointer-events: none;
 }
 
 // Video controls
@@ -332,11 +341,13 @@
     left: 0;
     right: 0;
     bottom: 0;
+    z-index: 2;
     padding: (@plyr-control-spacing * 5) @plyr-control-spacing @plyr-control-spacing;
     background: linear-gradient(fade(@plyr-video-controls-bg, 0%), fade(@plyr-video-controls-bg, 50%));
     border-bottom-left-radius: inherit;
     border-bottom-right-radius: inherit;
     color: @plyr-video-control-color;
+    transition: opacity .3s ease;
 
     button {
         // Hover and tab focus
@@ -354,7 +365,6 @@
     border-radius: inherit;
     background: @plyr-audio-controls-bg;
     border: @plyr-audio-controls-border;
-    box-shadow: @plyr-audio-controls-box-shadow;
     color: @plyr-audio-control-color;
 
     button {
@@ -371,6 +381,7 @@
 .plyr__play-large {
     display: none;
     position: absolute;
+    z-index: 1;
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
@@ -378,7 +389,7 @@
     background: @plyr-video-control-bg-hover;
     border: 4px solid currentColor;
     border-radius: 100%;
-    box-shadow: 0 1px 1px fade(@plyr-video-controls-bg, 15%);
+    box-shadow: 0 1px 1px fade(#000, 15%);
     color: @plyr-video-control-color;
     transition: all .3s ease;
 
@@ -466,7 +477,7 @@
         height: 0;
         left: 50%;
         transform: translateX(-50%);
-    
+
         // The background triangle
         bottom: -@plyr-tooltip-arrow-size;
         border-right: @plyr-tooltip-arrow-size solid transparent;
@@ -614,16 +625,16 @@
     }
     &::-moz-progress-bar {
         transition: width .2s ease;
-    }    
+    }
     &::-ms-fill {
         transition: width .2s ease;
-    }            
+    }
 }
 .plyr--video .plyr__progress--buffer,
 .plyr--video .plyr__volume--display {
     background: @plyr-video-range-track-bg;
 }
-.plyr--video .plyr__progress--buffer { 
+.plyr--video .plyr__progress--buffer {
     color: @plyr-video-progress-buffered-bg;
 }
 .plyr--audio .plyr__progress--buffer,
@@ -663,7 +674,6 @@
     display: inline-block;
     vertical-align: middle;
     font-size: @plyr-font-size-small;
-    line-height: .95;
 }
 // Media duration hidden on small screens
 .plyr__time + .plyr__time {
@@ -712,7 +722,6 @@
 
 // Fullscreen
 // --------------------------------------------------------------
-.plyr--fullscreen,
 .plyr--fullscreen-active {
     position: fixed;
     top: 0;
@@ -723,7 +732,7 @@
     width: 100%;
     z-index: 10000000;
     background: #000;
-    border-radius: 0;
+    border-radius: 0 !important;
 
     video {
         height: 100%;
@@ -732,6 +741,10 @@
         height: 100%;
         width: 100%;
     }
+    .plyr__video-embed {
+        // Revert overflow change
+        overflow: visible;
+    }
     .plyr__controls {
         position: absolute;
         bottom: 0;

src/less/variables.less

@@ -11,7 +11,8 @@
 // Colors
 @plyr-color-main:                       #3498db;
 
-// Font sizes
+// Font
+@plyr-font-family:                      Avenir, 'Avenir Next', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif;
 @plyr-font-size-small:                  14px;
 @plyr-font-size-base:                   16px;
 
@@ -32,7 +33,6 @@
 @plyr-video-control-bg-hover:           @plyr-color-main;
 @plyr-audio-controls-bg:                #fff;
 @plyr-audio-controls-border:            1px solid #dbe3e8;
-@plyr-audio-controls-box-shadow:        0 1px 1px fade(#000, 5%);
 @plyr-audio-control-color:              #565D64;
 @plyr-audio-control-color-hover:        #fff;
 @plyr-audio-control-bg-hover:           @plyr-color-main;
@@ -68,4 +68,5 @@
 
 // Breakpoints
 @plyr-bp-screen-sm:                     480px;
-@plyr-bp-screen-md:                     768px;
+@plyr-bp-screen-md:                     768px;
+@plyr-bp-screen-lg:                     1024px;

src/scss/plyr.scss

@@ -19,7 +19,7 @@
     position: relative;
     max-width: 100%;
     min-width: 200px;
-    font-family: Avenir, "Avenir Next", "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif;
+    font-family: $plyr-font-family;
     direction: ltr;
 
     @if $plyr-border-box == true {
@@ -40,6 +40,11 @@
       }
     }
 
+    // Focus
+    &:focus {
+        outline: 0;
+    }
+
     // Media elements
     video,
     audio {
@@ -56,14 +61,14 @@
         height: ($plyr-range-thumb-height * $plyr-range-thumb-active-scale);
         width: 100%;
         margin: 0;
-        padding: 0; 
+        padding: 0;
         vertical-align: middle;
-        
+
         appearance: none;
         cursor: pointer;
         border: none;
         background: transparent;
-        
+
         // WebKit
         &::-webkit-slider-runnable-track {
             @include plyr-range-track();
@@ -81,7 +86,7 @@
         &::-moz-range-thumb {
             @include plyr-range-thumb();
         }
-        
+
         // Microsoft
         &::-ms-track {
             height: $plyr-range-track-height;
@@ -99,7 +104,7 @@
         &::-ms-thumb {
             @include plyr-range-thumb();
             // For some reason, Edge uses the -webkit margin above
-            margin-top: 0; 
+            margin-top: 0;
         }
         &::-ms-tooltip {
             display: none;
@@ -111,11 +116,11 @@
         }
         &::-moz-focus-outer {
             border: 0;
-        }        
+        }
         &.tab-focus:focus {
             outline-offset: 3px;
         }
-        
+
         // Pressed styles
         &:active {
             &::-webkit-slider-thumb {
@@ -167,18 +172,18 @@
     position: relative;
     background: #000;
     border-radius: inherit;
-
-    // Cleaner radius, also forces iframe radius
-    -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
 }
 
 // Container for embeds
 .plyr__video-embed {
     padding-bottom: 56.25%; /* 16:9 */
     height: 0;
-    overflow: hidden;
     border-radius: inherit;
 
+    // Require overflow and z-index to force border-radius
+    overflow: hidden;
+    z-index: 0;
+
     iframe {
         position: absolute;
         top: 0;
@@ -225,6 +230,8 @@
         border-radius: 2px;
         padding: floor($plyr-control-spacing / 3) $plyr-control-spacing;
         background: $plyr-captions-bg;
+        box-decoration-break: clone;
+        line-height: 150%;
     }
     span:empty {
         display: none;
@@ -237,12 +244,15 @@
 .plyr--captions-active .plyr__captions {
     display: block;
 }
-.plyr--fullscreen-active .plyr__captions {
-    font-size: $plyr-font-size-captions-large;
-}
 .plyr--hide-controls .plyr__captions {
     transform: translateY(-($plyr-control-spacing * 2));
 }
+// Large captions in full screen on larger screens
+@media (min-width: $plyr-bp-screen-lg) {
+    .plyr--fullscreen-active .plyr__captions {
+        font-size: $plyr-font-size-captions-large;
+    }
+}
 
 // Controls
 // --------------------------------------------------------------
@@ -254,13 +264,10 @@
 // Playback controls
 .plyr__controls {
     display: flex;
-    align-items: center; 
-
+    align-items: center;
     line-height: 1;
     text-align: center;
 
-    transition: opacity .3s ease;
-
     // Spacing
     > button,
     .plyr__progress,
@@ -321,9 +328,10 @@
         }
     }
 }
-// Hide controls 
+// Hide controls
 .plyr--hide-controls .plyr__controls {
     opacity: 0;
+    pointer-events: none;
 }
 
 // Video controls
@@ -337,6 +345,7 @@
     border-bottom-left-radius: inherit;
     border-bottom-right-radius: inherit;
     color: $plyr-video-control-color;
+    transition: opacity .3s ease;
 
     button {
         // Hover and tab focus
@@ -354,7 +363,6 @@
     border-radius: inherit;
     background: $plyr-audio-controls-bg;
     border: $plyr-audio-controls-border;
-    box-shadow: $plyr-audio-controls-box-shadow;
     color: $plyr-audio-control-color;
 
     button {
@@ -371,6 +379,7 @@
 .plyr__play-large {
     display: none;
     position: absolute;
+    z-index: 1;
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
@@ -378,7 +387,7 @@
     background: $plyr-video-control-bg-hover;
     border: 4px solid currentColor;
     border-radius: 100%;
-    box-shadow: 0 1px 1px transparentize($plyr-video-controls-bg, .85);
+    box-shadow: 0 1px 1px transparentize(#000, .85);
     color: $plyr-video-control-color;
     transition: all .3s ease;
 
@@ -466,7 +475,7 @@
         height: 0;
         left: 50%;
         transform: translateX(-50%);
-    
+
         // The background triangle
         bottom: -$plyr-tooltip-arrow-size;
         border-right: $plyr-tooltip-arrow-size solid transparent;
@@ -613,16 +622,16 @@
     }
     &::-moz-progress-bar {
         transition: width .2s ease;
-    }    
+    }
     &::-ms-fill {
         transition: width .2s ease;
-    }            
+    }
 }
 .plyr--video .plyr__progress--buffer,
 .plyr--video .plyr__volume--display {
     background: $plyr-video-range-track-bg;
 }
-.plyr--video .plyr__progress--buffer { 
+.plyr--video .plyr__progress--buffer {
     color: $plyr-video-progress-buffered-bg;
 }
 .plyr--audio .plyr__progress--buffer,
@@ -662,7 +671,6 @@
     display: inline-block;
     vertical-align: middle;
     font-size: $plyr-font-size-small;
-    line-height: .95;
 }
 // Media duration hidden on small screens
 .plyr__time + .plyr__time {
@@ -711,7 +719,6 @@
 
 // Fullscreen
 // --------------------------------------------------------------
-.plyr--fullscreen,
 .plyr--fullscreen-active {
     position: fixed;
     top: 0;
@@ -722,7 +729,7 @@
     width: 100%;
     z-index: 10000000;
     background: #000;
-    border-radius: 0;
+    border-radius: 0 !important;
 
     video {
         height: 100%;
@@ -731,6 +738,10 @@
         height: 100%;
         width: 100%;
     }
+    .plyr__video-embed {
+        // Revert overflow change
+        overflow: visible;
+    }
     .plyr__controls {
         position: absolute;
         bottom: 0;

src/scss/variables.scss

@@ -13,6 +13,7 @@ $plyr-sr-only-important:                true !default;
 $plyr-color-main:                       #3498db !default;
 
 // Font sizes
+$plyr-font-family:                      Avenir, 'Avenir Next', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif !default;
 $plyr-font-size-small:                  14px !default;
 $plyr-font-size-base:                   16px !default;
 
@@ -33,7 +34,6 @@ $plyr-video-control-color-hover:        #fff !default;
 $plyr-video-control-bg-hover:           $plyr-color-main !default;
 $plyr-audio-controls-bg:                #fff !default;
 $plyr-audio-controls-border:            1px solid #dbe3e8 !default;
-$plyr-audio-controls-box-shadow:        0 1px 1px transparentize(#000, .95) !default;
 $plyr-audio-control-color:              #565D64 !default;
 $plyr-audio-control-color-hover:        #fff !default;
 $plyr-audio-control-bg-hover:           $plyr-color-main;
@@ -69,4 +69,5 @@ $plyr-range-selected-bg:                $plyr-color-main !default;
 
 // Breakpoints
 $plyr-bp-screen-sm:                     480px !default;
-$plyr-bp-screen-md:                     768px !default;
+$plyr-bp-screen-md:                     768px !default;
+$plyr-bp-screen-lg:                     1024px !default;