Merge branch 'master' of github.com:selz/plyr

fix: use custom localStorage key for volume setting

.gitignore

@@ -4,3 +4,4 @@ node_modules
 .DS_Store
 aws.json
 docs/index.dev.html
+*.mp4

changelog.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## v1.1.2
+- Added an onSetup callback option
+- Added fullscreen API methods toggleFullscreen() (must be user iniated), and isFullscreen()
+
+## v1.1.1
+- Fix for unsupported browser handling
+- Fix for config.controls having no effect
+
+## v1.1.0
+- Added config option to set which controls are shown (if using the default controls html) and better handling of missing controls
+
+## v1.0.31
+- Display duration on metadataloaded
+
+## v1.0.30
+- Fixed bug with media longer than 60 minutes (Fixes #69)
+
+## v1.0.29
+- Added option to hide controls on fullscreen (default `true`) while palying, after 1s. Pause, mouse hover on progress, or focus on a child control re-shows the controls. On touch a tap of the video (which plays/pauses the video by default) is required. (Fixes #47)
+- Fixed a bug with caption toggle in 1.0.28
+
+## v1.0.28
+- Added API support for browsers that don't have full plyr support (pretty much <=IE9 and `<video>` on iPhone/iPod)
+
+## v1.0.27
+- Keyboard accessibility improvements (Fixes #66)
+
 ## v1.0.26
 - Fixes for SASS (cheers @brunowego)
 - Indentation reset to 4 spaces

controls.md

@@ -2,7 +2,7 @@
 
 This is the markup that is rendered for the Plyr controls. You can use the default controls or provide a customized version of markup based on your needs. 
 
-The demo Plyr setup uses a Hogan template. This purely to allow for localization at a later date. Check out `controls.html` in `/src/templates` to get an idea of how the default html is structured. Alternatively check out the `plyr.js` source.
+The demo Plyr setup uses a Hogan template. This purely to allow for localization at a later date. Check out `controls.html` in `/src/templates` to get an idea of how the default html is structured.
 
 ## Requirements
 
@@ -13,11 +13,11 @@ You need to add several placeholders to your html template that are replaced whe
 - `{id}` - the dynamically generated ID for the player (for form controls)
 - `{seektime}` - the seek time specified in options for fast forward and rewind
 
-Currently all buttons and inputs need to be present for Plyr to work but later we'll make it more dynamic so if you omit a button or input, it'll still work. 
+You can include only the controls you need when specifying custom html. 
 
-## Default
+## Example
 
-This is the default `html` option from `plyr.js`.
+This is an example `html` option with all controls.
 
 ```javascript
 ["<div class='player-controls'>",
@@ -53,7 +53,11 @@ This is the default `html` option from `plyr.js`.
             "<span class='sr-only'>Forward {seektime} secs</span>",
         "</button>",
         "<span class='player-time'>",
-            "<span class='sr-only'>Time</span>",
+            "<span class='sr-only'>Current time</span>",
+            "<span class='player-current-time'>00:00</span>",
+        "</span>",
+        "<span class='player-time'>",
+            "<span class='sr-only'>Duration</span>",
             "<span class='player-duration'>00:00</span>",
         "</span>",
     "</span>",

docs/dist/docs.css

@@ -1 +1 @@
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@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"),url(//cdn.plyr.io/fonts/avenir-medium.ttf) format("truetype");font-style:normal;font-weight:400}@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"),url(//cdn.plyr.io/fonts/avenir-bold.ttf) format("truetype");font-style:normal;font-weight:600}*,::after,::before{box-sizing:border-box}body{font-family:Avenir,"Helvetica Neue",Helvetica,Arial,sans-serif;background:#fff;line-height:1.5;text-align:center;color:#6D797F}.error body,html.error{height:100%}.error body{width:100%;display:table;table-layout:fixed}.error main{display:table-cell;width:100%;vertical-align:middle}h1,h2{letter-spacing:-.025em;color:#2E3C44;margin:0 0 10px;line-height:1.2;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}h1{font-size:64px;font-size:4rem;color:#3498DB}p,small{margin:0 0 20px}small{display:block;padding:0 10px;font-size:14px;font-size:.9rem}header{padding:20px;margin-bottom:20px}header p{font-size:18px;font-size:1.1rem}@media (min-width:560px){header{padding-top:60px;padding-bottom:60px}}section{padding-bottom:20px}@media (min-width:560px){section{padding-bottom:40px}}a{text-decoration:none;color:#3498db;border-bottom:1px solid currentColor;transition:all .3s ease}a:focus,a:hover{color:#000}a:focus{outline:#343f4a dotted thin;outline-offset:1px}a.logo{border:0}.btn{display:inline-block;padding:10px 30px;background:#3498db;border:0;color:#fff;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:600;border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:hover{color:#fff;background:#258cd1}.example-audio .player{max-width:480px}.example-video .player{max-width:1200px}.example-audio .player,.example-video .player{margin:0 auto 20px}.example-audio .player-fullscreen,.example-audio .player.fullscreen-active,.example-video .player-fullscreen,.example-video .player.fullscreen-active{max-width:none}footer{margin-bottom:20px}footer p{margin-bottom:10px}
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@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"),url(//cdn.plyr.io/fonts/avenir-medium.ttf) format("truetype");font-style:normal;font-weight:400}@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"),url(//cdn.plyr.io/fonts/avenir-bold.ttf) format("truetype");font-style:normal;font-weight:600}*,::after,::before{box-sizing:border-box}body{font-family:Avenir,"Helvetica Neue",Helvetica,Arial,sans-serif;background:#fff;line-height:1.5;text-align:center;color:#6D797F}.error body,html.error{height:100%}.error body{width:100%;display:table;table-layout:fixed}.error main{display:table-cell;width:100%;vertical-align:middle}h1,h2{letter-spacing:-.025em;color:#2E3C44;margin:0 0 10px;line-height:1.2;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}h1{font-size:64px;font-size:4rem;color:#3498DB}p,small{margin:0 0 20px}small{display:block;padding:0 10px;font-size:14px;font-size:.9rem}header{padding:20px;margin-bottom:20px}header p{font-size:18px;font-size:1.1rem}@media (min-width:560px){header{padding-top:60px;padding-bottom:60px}}section{padding-bottom:20px}@media (min-width:560px){section{padding-bottom:40px}}a{text-decoration:none;color:#3498db;border-bottom:1px solid currentColor;transition:all .3s ease}a:focus,a:hover{color:#000}a:focus{outline:#343f4a dotted thin;outline-offset:1px}a.logo{border:0}.btn{display:inline-block;padding:10px 30px;background:#3498db;border:0;color:#fff;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:600;border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:hover{color:#fff;background:#258cd1}.example-audio .player{max-width:520px}.example-video .player{max-width:1200px}.example-audio .player,.example-video .player{margin:0 auto 20px}.example-audio .player-fullscreen,.example-audio .player.fullscreen-active,.example-video .player-fullscreen,.example-video .player.fullscreen-active{max-width:none}footer{margin-bottom:20px}footer p{margin-bottom:10px}

docs/dist/templates.js

@@ -1,2 +1,2 @@
     var templates = {};
-    templates['controls'] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||"");t.b("<div class=\"player-controls\">");t.b("\n" + i);t.b("    <div class=\"player-progress\">");t.b("\n" + i);t.b("        <label for=\"seek{id}\" class=\"sr-only\">Seek</label>");t.b("\n" + i);t.b("        <input id=\"seek{id}\" class=\"player-progress-seek\" type=\"range\" min=\"0\" max=\"100\" step=\"0.5\" value=\"0\" data-player=\"seek\">");t.b("\n" + i);t.b("        <progress class=\"player-progress-played\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% played");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("        <progress class=\"player-progress-buffer\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% buffered");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("    </div>");t.b("\n" + i);t.b("    <span class=\"player-controls-left\">");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"restart\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-restart\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Restart</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"rewind\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-rewind\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Rewind {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"play\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-play\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Play</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"pause\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-pause\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Pause</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fast-forward\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-fast-forward\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Forward {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <span class=\"player-time\">");t.b("\n" + i);t.b("            <span class=\"sr-only\">Time</span>");t.b("\n" + i);t.b("            <span class=\"player-duration\">00:00</span>");t.b("\n" + i);t.b("        </span>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("    <span class=\"player-controls-right\">");t.b("\n" + i);t.b("        <input class=\"inverted sr-only\" id=\"mute{id}\" type=\"checkbox\" data-player=\"mute\">");t.b("\n" + i);t.b("        <label id=\"mute{id}\" for=\"mute{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-muted\"><use xlink:href=\"#icon-muted\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-volume\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Mute</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <label for=\"volume{id}\" class=\"sr-only\">Volume</label>");t.b("\n" + i);t.b("        <input id=\"volume{id}\" class=\"player-volume\" type=\"range\" min=\"0\" max=\"10\" step=\"0.5\" value=\"0\" data-player=\"volume\">");t.b("\n");t.b("\n" + i);t.b("        <input class=\"sr-only\" id=\"captions{id}\" type=\"checkbox\" data-player=\"captions\">");t.b("\n" + i);t.b("        <label for=\"captions{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-captions-on\"><use xlink:href=\"#icon-captions-on\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-captions-off\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Captions</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fullscreen\">");t.b("\n" + i);t.b("            <svg class=\"icon-exit-fullscreen\"><use xlink:href=\"#icon-exit-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-enter-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Fullscreen</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("</div>");return t.fl(); },partials: {}, subs: {  }});
+    templates['controls'] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||"");t.b("<div class=\"player-controls\">");t.b("\n" + i);t.b("    <div class=\"player-progress\">");t.b("\n" + i);t.b("        <label for=\"seek{id}\" class=\"sr-only\">Seek</label>");t.b("\n" + i);t.b("        <input id=\"seek{id}\" class=\"player-progress-seek\" type=\"range\" min=\"0\" max=\"100\" step=\"0.5\" value=\"0\" data-player=\"seek\">");t.b("\n" + i);t.b("        <progress class=\"player-progress-played\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% played");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("        <progress class=\"player-progress-buffer\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% buffered");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("    </div>");t.b("\n" + i);t.b("    <span class=\"player-controls-left\">");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"restart\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-restart\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Restart</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"rewind\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-rewind\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Rewind {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"play\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-play\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Play</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"pause\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-pause\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Pause</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fast-forward\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-fast-forward\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Forward {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <span class=\"player-time\">");t.b("\n" + i);t.b("            <span class=\"sr-only\">Current time</span>");t.b("\n" + i);t.b("            <span class=\"player-current-time\">00:00</span>");t.b("\n" + i);t.b("        </span>");t.b("\n" + i);t.b("        <span class=\"player-time\">");t.b("\n" + i);t.b("            <span class=\"sr-only\">Duration</span>");t.b("\n" + i);t.b("            <span class=\"player-duration\">00:00</span>");t.b("\n" + i);t.b("        </span>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("    <span class=\"player-controls-right\">");t.b("\n" + i);t.b("        <input class=\"inverted sr-only\" id=\"mute{id}\" type=\"checkbox\" data-player=\"mute\">");t.b("\n" + i);t.b("        <label id=\"mute{id}\" for=\"mute{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-muted\"><use xlink:href=\"#icon-muted\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-volume\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Mute</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <label for=\"volume{id}\" class=\"sr-only\">Volume</label>");t.b("\n" + i);t.b("        <input id=\"volume{id}\" class=\"player-volume\" type=\"range\" min=\"0\" max=\"10\" step=\"0.5\" value=\"0\" data-player=\"volume\">");t.b("\n");t.b("\n" + i);t.b("        <input class=\"sr-only\" id=\"captions{id}\" type=\"checkbox\" data-player=\"captions\">");t.b("\n" + i);t.b("        <label for=\"captions{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-captions-on\"><use xlink:href=\"#icon-captions-on\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-captions-off\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Captions</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fullscreen\">");t.b("\n" + i);t.b("            <svg class=\"icon-exit-fullscreen\"><use xlink:href=\"#icon-exit-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-enter-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Fullscreen</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("</div>");return t.fl(); },partials: {}, subs: {  }});

docs/error.html

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

docs/index.html

@@ -8,10 +8,10 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <!-- Styles -->
-        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.1.2/plyr.css">
 
         <!-- Docs styles -->
-        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.1.2/docs.css">
     </head>
     <body>
         <header>
@@ -67,13 +67,29 @@
         <!-- Load SVG defs -->
         <!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
         <script>
-        (function(d,p){var a=new XMLHttpRequest(),b=d.body;a.open("GET",p,!0);a.send();a.onload=function(){var c=d.createElement("div");c.style.display="none";c.innerHTML=a.responseText;b.insertBefore(c,b.childNodes[0])}})(document,"//cdn.plyr.io/1.0.27/sprite.svg");
+        (function(d, u){
+            var a = new XMLHttpRequest(),
+                b = d.body;
+
+            // Check for CORS support
+            // If you're loading from same domain, you can remove the if statement
+            if("withCredentials" in a) {
+                a.open("GET", u, true);
+                a.send();
+                a.onload = function(){
+                    var c = d.createElement("div");
+                    c.style.display="none";
+                    c.innerHTML = a.responseText;
+                    b.insertBefore(c, b.childNodes[0]);
+                }
+            }
+        })(document, "https://cdn.plyr.io/1.1.2/sprite.svg");
         </script>
 
         <!-- Plyr core script -->
-        <script src="//cdn.plyr.io/1.0.27/plyr.js"></script>
+        <script src="//cdn.plyr.io/1.1.2/plyr.js"></script>
 
         <!-- Docs script -->
-        <script src="//cdn.plyr.io/1.0.27/docs.js"></script>
+        <script src="//cdn.plyr.io/1.1.2/docs.js"></script>
     </body>
 </html>

docs/src/js/docs.js

@@ -11,9 +11,21 @@ plyr.setup({
 	html: 	templates.controls.render({}),
 	captions: {
 		defaultActive: true
+	},
+	onSetup: function() {
+		var player 	= this,
+			type 	= player.media.tagName.toLowerCase(),
+			toggle 	= document.querySelector("[data-toggle='fullscreen']");
+
+		console.log("✓ Setup done for <" + type + ">");
+
+		if(type === "video" && toggle) {
+			toggle.addEventListener("click", player.toggleFullscreen, false);
+		}
 	}
 });
 
+
 // Google analytics 
 // For demo site (http://[www.]plyr.io) only
 if(document.domain.indexOf("plyr.io") > -1) {

docs/src/less/docs.less

@@ -139,7 +139,7 @@ a {
 
 // Players
 .example-audio .player {
-    max-width: 480px;
+    max-width: 520px;
 }
 .example-video .player {
     max-width: 1200px;

docs/src/templates/controls.html

@@ -31,7 +31,11 @@
             <span class="sr-only">Forward {seektime} secs</span>
         </button>
         <span class="player-time">
-            <span class="sr-only">Time</span>
+            <span class="sr-only">Current time</span>
+            <span class="player-current-time">00:00</span>
+        </span>
+        <span class="player-time">
+            <span class="sr-only">Duration</span>
             <span class="player-duration">00:00</span>
         </span>
     </span>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plyr",
-  "version": "1.0.27",
+  "version": "1.1.2",
   "description": "A simple HTML5 media player using custom controls",
   "homepage": "http://plyr.io",
   "main": "gulpfile.js",

readme.md

@@ -3,14 +3,14 @@ A simple, accessible HTML5 media player.
 
 [Checkout the demo](http://plyr.io)
 
-[![Image of Plyr](https://cdn.plyr.io/static/plyr.png?1)](http://plyr.io)
+[![Image of Plyr](https://cdn.plyr.io/static/plyr.png?2)](http://plyr.io)
 
 ## Why?
 We wanted a lightweight, accessible and customisable media player that just supports *modern* browsers. Sure, there are many other players out there but we wanted to keep things simple, using the right elements for the job. 
 
 ## Features
 - **Accessible** - full support for captions and screen readers.
-- **Lightweight** - just 5.7KB minified and gzipped.
+- **Lightweight** - just 6.4KB minified and gzipped.
 - **Customisable** - make the player look how you want with the markup you want.
 - **Semantic** - uses the *right* elements. `<input type="range">` for volume and `<progress>` for progress and well, `<button>`s for buttons. There's no `<span>` or `<a href="#">` button hacks.
 - **Responsive** - as you'd expect these days.
@@ -38,7 +38,7 @@ If you have any cool ideas or features, please let me know by [creating an issue
 
 Check `docs/index.html` and `docs/dist/docs.js` for an example setup. 
 
-**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.0.27/plyr.js` to `https://cdn.plyr.io/1.0.27/plyr.js`
+**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.2/plyr.js` to `https://cdn.plyr.io/1.1.2/plyr.js`
 
 ### Bower
 If bower is your thang, you can grab Plyr using:
@@ -47,15 +47,22 @@ bower install plyr
 ```
 More info on setting up dependencies can be found in the [Bower Docs](http://bower.io/docs/creating-packages/#maintaining-dependencies)
 
+### Ember
+The awesome [@louisrudner](https://twitter.com/louisrudner) has created an ember component, available by running:
+```
+ember addon:install ember-cli-plyr
+```
+More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub](https://github.com/louisrudner/ember-cli-plyr)
+
 ### CDN 
 If you want to use our CDN, you can use the following. HTTPS (SSL) is supported.
 
 ```html
-<link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css">
-<script src="//cdn.plyr.io/1.0.27/plyr.js"></script>
+<link rel="stylesheet" href="//cdn.plyr.io/1.1.2/plyr.css">
+<script src="//cdn.plyr.io/1.1.2/plyr.js"></script>
 ```
 
-You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.27/sprite.svg`.
+You can also access the `sprite.svg` file at `//cdn.plyr.io/1.1.2/sprite.svg`.
 
 ### CSS
 If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. 
@@ -130,7 +137,7 @@ You'll notice the `crossorigin` attribute on the example `<video>` and `<audio>`
 More info on CORS here:
 [https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS)
 
-###JavaScript
+### JavaScript
 Much of the behaviour of the player is configurable when initialising the library. Below is an example of a default instance.
 
 ```html
@@ -168,6 +175,12 @@ You can pass the following options to the setup method.
     <td><code><a href="controls.md">See controls.md</a></code></td>
     <td>See <a href="controls.md">controls.md</a> for more info on how the html needs to be structured.</td>
   </tr>
+  <tr>
+    <td><code>controls</code></td>
+    <td>Array</td>
+    <td><code>["restart", "rewind", "play", "fast-forward", "current-time", "duration", "mute", "volume", "captions", "fullscreen"]</code></td>
+    <td>Toggle which control elements you would like to display when using the default controls html. If you specify a <code>html</code> option, this is redundant. The default value is to display everything.</td>
+  </tr>
   <tr>
     <td><code>debug</code></td>
     <td>Boolean</td>
@@ -197,6 +210,12 @@ You can pass the following options to the setup method.
     <td>Boolean</td>
     <td><code>false</code></td>
     <td>Display control labels as tooltips on :hover &amp; :focus (by default, the labels are screen reader only).</td>
+  </tr>
+    <tr>
+    <td><code>displayDuration</code></td>
+    <td>Boolean</td>
+    <td><code>true</code></td>
+    <td>Displays the duration of the media on the "metadataloaded" event (on startup) in the current time display. This will only work if the `preload` attribute is not set to `none` (or is not set at all) and you choose not to display the duration (see <code>controls</code> option).</td>
   </tr>
   <tr>
     <td><code>selectors</code></td>
@@ -220,7 +239,7 @@ You can pass the following options to the setup method.
     <td><code>fullscreen</code></td>
     <td>Object</td>
     <td>&mdash;</td>
-    <td>Two properties; <code>enabled</code> which toggles if fullscreen should be enabled (if the browser supports it). The default value is <code>true</code>. Also an extra property called <code>fallback</code> which will enable a full window view for older browsers. The default value is <code>true</code>.</td>
+    <td>Three properties; <code>enabled</code> which toggles if fullscreen should be enabled (if the browser supports it). The default value is <code>true</code>. A <code>fallback</code> property which will enable a full window view for older browsers. The default value is <code>true</code>. A <code>hideControls</code> property which will hide the controls when fullscreen is active and the video is playing, after 1s. The controls reappear on hover of the progress bar (mouse), focusing a child control or pausing the video (by tap/click of video if `click` is `true`). The default value is <code>true</code>.</td>
   </tr>
   <tr>
     <td><code>storage</code></td>
@@ -228,6 +247,12 @@ You can pass the following options to the setup method.
     <td>&mdash;</td>
     <td>Two properties; <code>enabled</code> which toggles if local storage should be enabled (if the browser supports it). The default value is `true`. This enables storing user settings, currently it only stores volume but more will be added later. The second property <code>key</code> is the key used for the local storage. The default is <code>plyr_volume</code> until more settings are stored.</td>
   </tr>
+  <tr>
+    <td><code>onSetup</code></td>
+    <td>Function</td>
+    <td>&mdash;</td>
+    <td>This callback function is called on every new plyr instance created. The context (<code>this</code>) is the plyr instance itself.</td>
+  </tr>
  </tbody>
 </table>
 
@@ -295,6 +320,16 @@ Here's a list of the methods supported:
     <td>&mdash;</td>
     <td>Toggles whether captions are enabled.</td>
   </tr>
+  <tr>
+    <td><code>toggleFullscreen()</code></td>
+    <td>&mdash;</td>
+    <td>Toggles fullscreen. This can only be initiated by a user gesture due to browser security, i.e. a user event such as click.</td>
+  </tr>
+  <tr>
+    <td><code>isFullscreen()</code></td>
+    <td>&mdash;</td>
+    <td>Boolean returned if the player is in fullscreen.</td>
+  </tr>
   <tr>
     <td><code>support(...)</code></td>
     <td>String</td>
@@ -315,7 +350,7 @@ Here's a list of the methods supported:
       This will inject a child `source` element for every element in the array with the specified attributes. `src` is the only required attribute although adding `type` is recommended as it helps the browser decide which file to download and play. 
     </td>
   </tr>
-    <tr>
+  <tr>
     <td><code>poster(...)</code></td>
     <td>String</td>
     <td>Set the poster url. This is supported for the <code>video</code> element only.</td>
@@ -338,11 +373,12 @@ A complete list of events can be found here:
 [Media Events - W3.org](http://www.w3.org/2010/05/video/mediaevents.html)
 
 ## Fullscreen
+
 Fullscreen in Plyr is supported for all browsers that [currently support it](http://caniuse.com/#feat=fullscreen). If you're using the default CSS, you can also use a "full browser" mode which will use the full browser window by adding the `player-fullscreen` class to your container.
 
 ## Browser support
 
-<table width="100%" style="text-align: center;">
+<table width="100%" style="text-align: center">
   <thead>
     <tr>
       <td>Safari</td>
@@ -359,15 +395,15 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt
       <td>✔</td>
       <td>✔</td>
       <td>✔</td>
-      <td>✖&sup2;</td>
+      <td>API&sup2;</td>
       <td>✔&sup3;</td>
     </tr>
   </tbody>
 </table>
 
-&sup1; iPhone forces the native player for `<video>` so no customisation possible. `<audio>` elements have volume controls disabled.
+&sup1; Mobile Safari on the iPhone forces the native player for `<video>` so no useful customisation is possible. `<audio>` elements have volume controls disabled.
 
-&sup2; Native player used (no support for `<progress>` or `<input type="range">`)
+&sup2; Native player used (no support for `<progress>` or `<input type="range">`) but the API is supported (v1.0.28+)
 
 &sup3; IE10 has no native fullscreen support, fallback can be used (see options)
 
@@ -380,19 +416,24 @@ If a User Agent is disabled but supports `<video>` and `<audio>` natively, it wi
 
 Any unsupported browsers will display links to download the media if the correct html is used.
 
+### Checking for support
+There's an API method for checking support. You can call `plyr.supported()` and optionally pass a type to it, e.g. `plyr.supported("video")`. It will return an object with two keys; `basic` meaning there's basic support for that media type (or both if no type is passed) and `full` meaning there's full support for plyr. 
+
 ## Issues
 If you find anything weird with Plyr, please let us know using the GitHub issues tracker.
 
 ## Author
-Plyr is developed by Sam Potts ([@sam_potts](https://twitter.com/sam_potts)) ([sampotts.me](http://sampotts.me))
+Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me)
 
 ## Mentions
 - [The Changelog](http://thechangelog.com/plyr-simple-html5-media-player-custom-controls-webvtt-captions/)
 - [HTML5 Weekly #177](http://html5weekly.com/issues/177)
+- [Responsive Design #149](http://us4.campaign-archive2.com/?u=559bc631fe5294fc66f5f7f89&id=451a61490f)
 - [Web Design Weekly #174](https://web-design-weekly.com/2015/02/24/web-design-weekly-174/)
 - [Hacker News](https://news.ycombinator.com/item?id=9136774)
 - [Web Platform Daily](http://webplatformdaily.org/releases/2015-03-04)
 - [LayerVault Designer News](https://news.layervault.com/stories/45394-plyr--a-simple-html5-media-player)
+- [The Treehouse Show #131](https://teamtreehouse.com/library/episode-131-origami-react-responsive-hero-images)
 
 ## Used by
 - [Selz.com](https://selz.com)

src/less/plyr.less

@@ -31,9 +31,9 @@
 @tooltip-radius:            3px;
 
 // Progress
-@progress-bg:               lighten(@gray, 10%);
+@progress-bg:               rgba(red(@gray), green(@gray), blue(@gray), .2);
 @progress-playing-bg:       @blue;
-@progress-buffered-bg:      @gray;
+@progress-buffered-bg:      rgba(red(@gray), green(@gray), blue(@gray), .25);
 @progress-loading-size:     40px;
 @progress-loading-bg:       rgba(0,0,0, .15);
 
@@ -179,7 +179,7 @@
         .clearfix();
         .font-smoothing();
         position: relative;
-        padding: (@control-spacing * 2) @control-spacing @control-spacing;
+        padding: @control-spacing;
         background: @controls-bg;
         line-height: 1;
         text-align: center;
@@ -259,6 +259,22 @@
             font-size: @font-size-small;
             .font-smoothing();
         }
+
+        // Media duration hidden on small screens
+        .player-time + .player-time {
+            display: none;
+
+            @media (min-width: @bp-control-split) {
+                display: inline-block;
+            }
+
+            // Add a slash in before
+            &::before {
+                content: "\2044";
+                margin-right: @control-spacing;
+                color: darken(@control-color, 30%);
+            }
+        }
     }
 
     // Tooltips
@@ -313,7 +329,7 @@
     // <progress> element
     &-progress {
         position: absolute;
-        top: 0;
+        bottom: 100%;
         left: 0;
         right: 0;
         width: 100%;
@@ -549,6 +565,17 @@
             left: 0;
             right: 0;
         }
+
+        // Hide controls when playing in full screen
+        &.fullscreen-hide-controls.playing .player-controls {
+            transform: translateY(100%) translateY(@control-spacing / 2);
+            transition: transform .3s 1s ease;
+
+            &.hover {
+                transform: translateY(0);
+                transition-delay: 0;
+            }
+        }
     }
 
     // Change icons on state change
@@ -575,10 +602,4 @@
     &.fullscreen-enabled [data-player='fullscreen'] + label {
         display: inline-block;
     }
-
-    // Full browser view hides toggle
-    &-fullscreen [data-player='fullscreen'],
-    &-fullscreen [data-player='fullscreen'] + label {
-        display: none !important;
-    }
 }

src/sass/plyr.scss

@@ -31,9 +31,9 @@ $tooltip-arrow-size:      5px;
 $tooltip-radius:          3px;
 
 // Progress
-$progress-bg:             lighten($gray, 10%);
+$progress-bg:             rgba(red($gray), green($gray), blue($gray), .2);
 $progress-playing-bg:     $blue;
-$progress-buffered-bg:    $gray;
+$progress-buffered-bg:    rgba(red($gray), green($gray), blue($gray), .25);
 $progress-loading-size:   40px;
 $progress-loading-bg:     rgba(0,0,0, .15);
 
@@ -187,7 +187,7 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
         @include clearfix();
         @include font-smoothing();
         position: relative;
-        padding: ($control-spacing * 2) $control-spacing $control-spacing;
+        padding: $control-spacing;
         background: $controls-bg;
         line-height: 1;
         text-align: center;
@@ -267,6 +267,22 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
             font-size: $font-size-small;
             @include font-smoothing();
         }
+
+        // Media duration hidden on small screens
+        .player-time + .player-time {
+            display: none;
+
+            @media (min-width: $bp-control-split) {
+                display: inline-block;
+            }
+
+            // Add a slash in before
+            &::before {
+                content: "\2044";
+                margin-right: $control-spacing;
+                color: darken($control-color, 30%);
+            }
+        }
     }
 
     // Tooltips
@@ -278,7 +294,7 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
         margin-bottom: $tooltip-padding;
         padding: $tooltip-padding ($tooltip-padding * 1.5);
 
-                opacity: 0;
+        opacity: 0;
         background: $tooltip-bg;
         border-radius: $tooltip-radius;
         color: $tooltip-color;
@@ -287,7 +303,7 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
         font-weight: 600;
 
         transform: translate(-50%, ($tooltip-padding * 3));
-                transition: transform .2s .2s ease, opacity .2s .2s ease;
+        transition: transform .2s .2s ease, opacity .2s .2s ease;
 
         &::after {
             content: "";
@@ -321,7 +337,7 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
     // <progress> element
     &-progress {
         position: absolute;
-        top: 0;
+        bottom: 100%;
         left: 0;
         right: 0;
         width: 100%;
@@ -557,6 +573,17 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
             left: 0;
             right: 0;
         }
+
+        // Hide controls when playing in full screen
+        &.fullscreen-hide-controls.playing .player-controls {
+            transform: translateY(100%) translateY($control-spacing / 2);
+            transition: transform .3s 1s ease;
+
+            &.hover {
+                transform: translateY(0);
+                transition-delay: 0;
+            }
+        }
     }
 
     // Change icons on state change
@@ -583,10 +610,4 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
     &.fullscreen-enabled [data-player='fullscreen'] + label {
         display: inline-block;
     }
-
-    // Full browser view hides toggle
-    &-fullscreen [data-player='fullscreen'],
-    &-fullscreen [data-player='fullscreen'] + label {
-        display: none !important;
-    }
-}
+}