Keyboard accessibility improvements (Fixes #66)

- Enter now works on checkboxes within the controls

bower.json

@@ -1,33 +1,33 @@
 {
-  "name": "plyr",
+    "name": "plyr",
-  "description": "A simple HTML5 media player using custom controls",
+    "description": "A simple HTML5 media player using custom controls",
-  "homepage": "http://plyr.io",
+    "homepage": "http://plyr.io",
-  "keywords": [
+    "keywords": [
-    "Audio",
+        "Audio",
-    "Video",
+        "Video",
-    "HTML5 Audio",
+        "HTML5 Audio",
-    "HTml5 Video"
+        "HTml5 Video"
-  ],
+    ],
-  "authors": [
+    "authors": [
-    "Sam Potts <me@sampotts.me>"
+        "Sam Potts <me@sampotts.me>"
-  ],
+    ],
-  "dependencies": {},
+    "dependencies": {},
-  "main": [
+    "main": [
-    "dist/plyr.css",
+        "dist/plyr.css",
-    "dist/plyr.js",
+        "dist/plyr.js",
-    "dist/sprite.svg",
+        "dist/sprite.svg",
-    "src/less/plyr.less",
+        "src/less/plyr.less",
-    "src/sass/plyr.sass",
+        "src/sass/plyr.sass",
-    "src/js/plyr.js"
+        "src/js/plyr.js"
-  ],
+    ],
-  "ignore": [
+    "ignore": [
-    "node_modules",
+        "node_modules",
-    "bower_components",
+        "bower_components",
-    ".gitignore"
+        ".gitignore"
-  ],
+    ],
-  "repository": {
+    "repository": {
-    "type": "git",
+        "type": "git",
-    "url": "git://github.com/selz/plyr.git"
+        "url": "git://github.com/selz/plyr.git"
-  },
+    },
-  "license": "MIT"
+    "license": "MIT"
 }

bundles.json

@@ -1,25 +1,25 @@
 {
-	"plyr": {
+    "plyr": {
-		"less": {
+        "less": {
-			"plyr.css": 	["src/less/plyr.less"]
+            "plyr.css":     ["src/less/plyr.less"]
-		},
+        },
-		"sass": {
+        "sass": {
-			"plyr.css": 	["src/less/plyr.sass"]
+            "plyr.css":     ["src/less/plyr.sass"]
-		},
+        },
-		"js": {
+        "js": {
-			"plyr.js": 		["src/js/plyr.js"]
+            "plyr.js":      ["src/js/plyr.js"]
-		}
+        }
-	},
+    },
-	"docs": {
+    "docs": {
-		"less": {
+        "less": {
-			"docs.css": 	["docs/src/less/docs.less"]
+            "docs.css":     ["docs/src/less/docs.less"]
-		},
+        },
-		"js": {
+        "js": {
-			"docs.js": [
+            "docs.js": [
-				"docs/src/js/lib/hogan-3.0.2.mustache.js",
+                "docs/src/js/lib/hogan-3.0.2.mustache.js",
-				"docs/dist/templates.js",
+                "docs/dist/templates.js",
-				"docs/src/js/docs.js"
+                "docs/src/js/docs.js"
-			]
+            ]
-		}
+        }
-	}
+    }
 }

changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.0.26
+- Fixes for SASS (cheers @brunowego)
+- Indentation reset to 4 spaces
+
+## v1.0.25
+- Fixes for iOS volume controls (hidden)
+- Classnames for left/right controls changed
+
 ## v1.0.24
 - Added tooltip option to display labels as tooltips (Fixes #50)
 

controls.md

@@ -31,7 +31,7 @@ This is the default `html` option from `plyr.js`.
             "<span>0</span>% buffered",
         "</progress>",
     "</div>",
-    "<span class='player-controls-playback'>",
+    "<span class='player-controls-left'>",
         "<button type='button' data-player='restart'>",
             "<svg><use xlink:href='#icon-restart'></use></svg>",
             "<span class='sr-only'>Restart</span>",
@@ -57,7 +57,7 @@ This is the default `html` option from `plyr.js`.
             "<span class='player-duration'>00:00</span>",
         "</span>",
     "</span>",
-    "<span class='player-controls-sound'>",
+    "<span class='player-controls-right'>",
         "<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>",
         "<label id='mute{id}' for='mute{id}'>",
             "<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>",

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-playback\">");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-sound\">");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\">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: {  }});

docs/error.html

@@ -1,18 +1,18 @@
 <!doctype html>
 <html lang="en" class="error">
-	<head>
+    <head>
-		<meta charset="utf-8" />
+        <meta charset="utf-8" />
-		<title>Doh. Looks like something went wrong.</title>
+        <title>Doh. Looks like something went wrong.</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
 
-		<!-- Docs styles -->
+        <!-- Docs styles -->
-		<link rel="stylesheet" href="//cdn.plyr.io/1.0.24/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/docs.css">
-	</head>
+    </head>
-	<body>
+    <body>
-		<main>
+        <main>
-			<h1>Doh.</h1>
+            <h1>Doh.</h1>
-			<p>Looks like something went wrong.</p>
+            <p>Looks like something went wrong.</p>
-			<a href="http://plyr.io" class="btn">Back to plyr.io</a>
+            <a href="http://plyr.io" class="btn">Back to plyr.io</a>
-		</main>
+        </main>
-	</body>
+    </body>
 </html>

docs/index.html

@@ -1,79 +1,79 @@
 <!doctype html>
 <html lang="en">
-	<head>
+    <head>
-		<meta charset="utf-8" />
+        <meta charset="utf-8" />
-		<title>Plyr - A simple HTML5 media player</title>
+        <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="description" content="A simple HTML5 media player with custom controls and WebVTT captions.">
-		<meta name="author" content="Sam Potts">
+        <meta name="author" content="Sam Potts">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
 
-		<!-- Styles -->
+        <!-- Styles -->
-		<link rel="stylesheet" href="//cdn.plyr.io/1.0.24/plyr.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css">
 
-		<!-- Docs styles -->
+        <!-- Docs styles -->
-		<link rel="stylesheet" href="//cdn.plyr.io/1.0.24/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/docs.css">
-	</head>
+    </head>
-	<body>
+    <body>
-		<header>
+        <header>
-			<h1>Plyr</h1>
+            <h1>Plyr</h1>
-			<p>A simple HTML5 media player with custom controls and WebVTT captions.</p>
+            <p>A simple HTML5 media player with custom controls and WebVTT captions.</p>
-			<a href="https://github.com/selz/plyr" target="_blank" class="btn">Download on GitHub</a>
+            <a href="https://github.com/selz/plyr" target="_blank" class="btn">Download on GitHub</a>
-		</header>
+        </header>
 
-		<main>
+        <main>
-			<section class="example-video">
+            <section class="example-video">
-				<div class="player">
+                <div class="player">
-					<video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
+                    <video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
-						<!-- Video files -->
+                        <!-- Video files -->
-						<source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
+                        <source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
-						<source src="//cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
+                        <source src="//cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
-						
+                        
-						<!-- Text track file -->
+                        <!-- Text track file -->
-						<track kind="captions" label="English" srclang="en" src="//cdn.selz.com/plyr/1.0/en.vtt" default>
+                        <track kind="captions" label="English" srclang="en" src="//cdn.selz.com/plyr/1.0/en.vtt" default>
-						
+                        
-						<!-- Fallback for browsers that don't support the <video> element -->
+                        <!-- Fallback for browsers that don't support the <video> element -->
-						<div>
+                        <div>
-							<a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
+                            <a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-						</div>
+                        </div>
-					</video>
+                    </video>
-				</div>
+                </div>
-				<small>Big Buck Bunny. More info can be found at <a href="https://peach.blender.org" target="_blank">peach.blender.org</a>.</small>
+                <small>Big Buck Bunny. More info can be found at <a href="https://peach.blender.org" target="_blank">peach.blender.org</a>.</small>
-			</section>
+            </section>
 
-			<section class="example-audio">
+            <section class="example-audio">
-				<div class="player">
+                <div class="player">
-					<audio controls>
+                    <audio controls>
-						<!-- Audio files -->
+                        <!-- Audio files -->
-						<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
+                        <source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
-						<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
+                        <source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
-						
+                        
-						<!-- Fallback for browsers that don't support the <audio> element -->
+                        <!-- Fallback for browsers that don't support the <audio> element -->
-						<div>
+                        <div>
-							<a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
+                            <a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
-						</div>
+                        </div>
-					</audio>
+                    </audio>
-				</div>
+                </div>
-				<small>"96" by Logistics, which can be purchased from <a href="https://www.hospitalrecords.com/shop/artist/logistics" target="_blank">Hospital Records</a>.</small>
+                <small>"96" by Logistics, which can be purchased from <a href="https://www.hospitalrecords.com/shop/artist/logistics" target="_blank">Hospital Records</a>.</small>
-			</section>
+            </section>
-		</main>
+        </main>
 
-		<footer>
+        <footer>
-			<p>Used by &hellip;</p>
+            <p>Used by &hellip;</p>
-			<a href="https://selz.com" target="_blank" class="logo">
+            <a href="https://selz.com" target="_blank" class="logo">
-				<img src="https://d33i624pw6jj68.cloudfront.net/static/img/logos/selz.svg" alt="Selz">
+                <img src="https://d33i624pw6jj68.cloudfront.net/static/img/logos/selz.svg" alt="Selz">
-			</a>
+            </a>
-		</footer>
+        </footer>
 
-		<!-- Load SVG defs -->
+        <!-- Load SVG defs -->
-		<!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
+        <!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
-		<script>
+        <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.24/sprite.svg");
+        (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");
-		</script>
+        </script>
 
-		<!-- Plyr core script -->
+        <!-- Plyr core script -->
-		<script src="//cdn.plyr.io/1.0.24/plyr.js"></script>
+        <script src="//cdn.plyr.io/1.0.27/plyr.js"></script>
 
-		<!-- Docs script -->
+        <!-- Docs script -->
-		<script src="//cdn.plyr.io/1.0.24/docs.js"></script>
+        <script src="//cdn.plyr.io/1.0.27/docs.js"></script>
-	</body>
+    </body>
 </html>

docs/src/js/docs.js

@@ -11,8 +11,7 @@ plyr.setup({
 	html: 	templates.controls.render({}),
 	captions: {
 		defaultActive: true
-	},
+	}
-	tooltips: true
 });
 
 // Google analytics 

docs/src/less/docs.less

@@ -12,153 +12,153 @@
 // Variables
 // ---------------------------------------
 // Colors
-@blue:          			#3498DB;
+@blue:                      #3498DB;
-@gray-dark: 				#343f4a;
+@gray-dark:                 #343f4a;
-@gray: 						#565d64;
+@gray:                      #565d64;
-@gray-light: 				#cbd0d3;
+@gray-light:                #cbd0d3;
 
 // Elements
-@link-color: 				@blue;
+@link-color:                @blue;
-@padding-base: 				20px;
+@padding-base:              20px;
 
 // Breakpoints
-@screen-md: 				768px;
+@screen-md:                 768px;
 
 // BORDER-BOX ALL THE THINGS! 
 // http://paulirish.com/2012/box-sizing-border-box-ftw/
 *, *::after, *::before {  
-	box-sizing: border-box; 
+    box-sizing: border-box; 
 }
 
 // Base
 body {
-	font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
-	background: #fff;
+    background: #fff;
-	line-height: 1.5;
+    line-height: 1.5;
-	text-align: center;
+    text-align: center;
-	color: #6D797F;
+    color: #6D797F;
 }
 
 // Error page
 html.error,
 .error body {
-	height: 100%;
+    height: 100%;
 }
 .error body {
-	width: 100%;
+    width: 100%;
-	display: table;
+    display: table;
-	table-layout: fixed;
+    table-layout: fixed;
 }
 .error main {
-	display: table-cell;
+    display: table-cell;
-	width: 100%;
+    width: 100%;
-	vertical-align: middle;
+    vertical-align: middle;
 }
 
 // Type
 h1,
 h2 {
-	letter-spacing: -.025em;
+    letter-spacing: -.025em;
-	color: #2E3C44;
+    color: #2E3C44;
-	margin: 0 0 (@padding-base / 2);
+    margin: 0 0 (@padding-base / 2);
-	line-height: 1.2;
+    line-height: 1.2;
-	.font-smoothing();
+    .font-smoothing();
 }
 h1 {
-	.font-size(64);
+    .font-size(64);
-	color: #3498DB;
+    color: #3498DB;
 }
 p,
 small {
-	margin: 0 0 @padding-base;
+    margin: 0 0 @padding-base;
 }
 small {
-	display: block;
+    display: block;
-	padding: 0 (@padding-base / 2);
+    padding: 0 (@padding-base / 2);
-	.font-size(14);
+    .font-size(14);
 }
 
 // Header
 header {
-	padding: @padding-base;
+    padding: @padding-base;
-	margin-bottom: @padding-base;
+    margin-bottom: @padding-base;
 
-	p {
+    p {
-		.font-size(18);
+        .font-size(18);
-	}
+    }
-	@media (min-width: 560px) {
+    @media (min-width: 560px) {
-		padding-top: (@padding-base * 3);
+        padding-top: (@padding-base * 3);
-		padding-bottom: (@padding-base * 3);
+        padding-bottom: (@padding-base * 3);
-	}
+    }
 }
 
 // Sections
 section {
-	padding-bottom: @padding-base;
+    padding-bottom: @padding-base;
 
-	@media (min-width: 560px) {
+    @media (min-width: 560px) {
-		padding-bottom: (@padding-base * 2);
+        padding-bottom: (@padding-base * 2);
-	}
+    }
 }
 
 // Links & Buttons
 a {
-	text-decoration: none;
+    text-decoration: none;
-	color: @link-color;
+    color: @link-color;
-	border-bottom: 1px solid currentColor;
+    border-bottom: 1px solid currentColor;
-	transition: all .3s ease;
+    transition: all .3s ease;
 
-	&:hover,
+    &:hover,
-	&:focus {
+    &:focus {
-		color: #000;
+        color: #000;
-	}
+    }
-	&:focus {
+    &:focus {
-		.tab-focus();
+        .tab-focus();
-	}
+    }
-	&.logo {
+    &.logo {
-		border: 0;
+        border: 0;
-	}
+    }
 }
 .btn {
-	display: inline-block;
+    display: inline-block;
-	padding: (@padding-base / 2) (@padding-base * 1.5);
+    padding: (@padding-base / 2) (@padding-base * 1.5);
-	background: @link-color;
+    background: @link-color;
-	border: 0;
+    border: 0;
-	color: #fff;
+    color: #fff;
-	.font-smoothing(on);
+    .font-smoothing(on);
-	font-weight: 600;
+    font-weight: 600;
-	border-radius: 3px;
+    border-radius: 3px;
-	user-select: none;
+    user-select: none;
-	
+    
-	&:hover,
+    &:hover,
-	&:focus {
+    &:focus {
-		color: #fff;
+        color: #fff;
-		background: darken(@link-color, 5%);
+        background: darken(@link-color, 5%);
-	}
+    }
 }
 
 // Players
 .example-audio .player {
-	max-width: 480px;
+    max-width: 480px;
 }
 .example-video .player {
-	max-width: 1200px;
+    max-width: 1200px;
 }
 .example-audio .player,
 .example-video .player {
-	margin: 0 auto @padding-base;
+    margin: 0 auto @padding-base;
 
-	&-fullscreen,
+    &-fullscreen,
-	&.fullscreen-active {
+    &.fullscreen-active {
-		max-width: none;
+        max-width: none;
-	}
+    }
 }
 
 // Footer
 footer {
-	margin-bottom: @padding-base;
+    margin-bottom: @padding-base;
 
-	p {
+    p {
-		margin-bottom: (@padding-base / 2);
+        margin-bottom: (@padding-base / 2);
-	}
+    }
 }

docs/src/less/lib/fontface.less

@@ -1,16 +1,16 @@
 @font-face {
-	font-family: "Avenir";
+    font-family: "Avenir";
-	src: 	url("//cdn.plyr.io/fonts/avenir-medium.woff2") format("woff2"), 
+    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.woff") format("woff"), 
-			url("//cdn.plyr.io/fonts/avenir-medium.ttf")  format("truetype");
+            url("//cdn.plyr.io/fonts/avenir-medium.ttf")  format("truetype");
-	font-style:   normal;
+    font-style:   normal;
-	font-weight:  400;
+    font-weight:  400;
 }
 @font-face {
-	font-family: "Avenir";
+    font-family: "Avenir";
-	src: 	url("//cdn.plyr.io/fonts/avenir-bold.woff2") format("woff2"), 
+    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.woff") format("woff"), 
-			url("//cdn.plyr.io/fonts/avenir-bold.ttf")  format("truetype");
+            url("//cdn.plyr.io/fonts/avenir-bold.ttf")  format("truetype");
-	font-style:   normal;
+    font-style:   normal;
-	font-weight:  600;
+    font-weight:  600;
 }

docs/src/less/lib/mixins.less

@@ -5,38 +5,38 @@
 // Contain floats: nicolasgallagher.com/micro-clearfix-hack/
 // ---------------------------------------
 .clearfix() {
-	zoom: 1;
+    zoom: 1;
-	&:before, 
+    &:before, 
-	&:after { content: ""; display: table; }
+    &:after { content: ""; display: table; }
-	&:after { clear: both; }
+    &:after { clear: both; }
 }
 
 // Webkit-style focus
 // ---------------------------------------
 .tab-focus() {
-	// Default
+    // Default
-	outline: thin dotted @gray-dark;
+    outline: thin dotted @gray-dark;
-	// Webkit
+    // Webkit
-	//outline: 5px auto -webkit-focus-ring-color;
+    //outline: 5px auto -webkit-focus-ring-color;
-	outline-offset: 1px;
+    outline-offset: 1px;
 }
 
 // Use rems for font sizing
 // Leave <body> at 100%/16px
 // ---------------------------------------
 .font-size(@font-size: 16){
-	@rem: round((@font-size / 16), 1);
+    @rem: round((@font-size / 16), 1);
-	font-size: (@font-size * 1px);
+    font-size: (@font-size * 1px);
-	font-size: ~"@{rem}rem";
+    font-size: ~"@{rem}rem";
 }
 
 // Font smoothing
 // ---------------------------------------
 .font-smoothing(@mode: on) when (@mode = on) {
-	-moz-osx-font-smoothing: grayscale;
+    -moz-osx-font-smoothing: grayscale;
-	-webkit-font-smoothing: antialiased;
+    -webkit-font-smoothing: antialiased;
 }
 .font-smoothing(@mode: on) when (@mode = off) {
-	-moz-osx-font-smoothing: auto;
+    -moz-osx-font-smoothing: auto;
-	-webkit-font-smoothing: subpixel-antialiased;
+    -webkit-font-smoothing: subpixel-antialiased;
 }

docs/src/templates/controls.html

@@ -1,62 +1,62 @@
 <div class="player-controls">
-	<div class="player-progress">
+    <div class="player-progress">
-		<label for="seek{id}" class="sr-only">Seek</label>
+        <label for="seek{id}" class="sr-only">Seek</label>
-		<input id="seek{id}" class="player-progress-seek" type="range" min="0" max="100" step="0.5" value="0" data-player="seek">
+        <input id="seek{id}" class="player-progress-seek" type="range" min="0" max="100" step="0.5" value="0" data-player="seek">
-		<progress class="player-progress-played" max="100" value="0">
+        <progress class="player-progress-played" max="100" value="0">
-			<span>0</span>% played
+            <span>0</span>% played
-		</progress>
+        </progress>
-		<progress class="player-progress-buffer" max="100" value="0">
+        <progress class="player-progress-buffer" max="100" value="0">
-			<span>0</span>% buffered
+            <span>0</span>% buffered
-		</progress>
+        </progress>
-	</div>
+    </div>
-	<span class="player-controls-playback">
+    <span class="player-controls-left">
-		<button type="button" data-player="restart">
+        <button type="button" data-player="restart">
-			<svg><use xlink:href="#icon-restart"></use></svg>
+            <svg><use xlink:href="#icon-restart"></use></svg>
-			<span class="sr-only">Restart</span>
+            <span class="sr-only">Restart</span>
-		</button>
+        </button>
-		<button type="button" data-player="rewind">
+        <button type="button" data-player="rewind">
-			<svg><use xlink:href="#icon-rewind"></use></svg>
+            <svg><use xlink:href="#icon-rewind"></use></svg>
-			<span class="sr-only">Rewind {seektime} secs</span>
+            <span class="sr-only">Rewind {seektime} secs</span>
-		</button>
+        </button>
-		<button type="button" data-player="play">
+        <button type="button" data-player="play">
-			<svg><use xlink:href="#icon-play"></use></svg>
+            <svg><use xlink:href="#icon-play"></use></svg>
-			<span class="sr-only">Play</span>
+            <span class="sr-only">Play</span>
-		</button>
+        </button>
-		<button type="button" data-player="pause">
+        <button type="button" data-player="pause">
-			<svg><use xlink:href="#icon-pause"></use></svg>
+            <svg><use xlink:href="#icon-pause"></use></svg>
-			<span class="sr-only">Pause</span>
+            <span class="sr-only">Pause</span>
-		</button>
+        </button>
-		<button type="button" data-player="fast-forward">
+        <button type="button" data-player="fast-forward">
-			<svg><use xlink:href="#icon-fast-forward"></use></svg>
+            <svg><use xlink:href="#icon-fast-forward"></use></svg>
-			<span class="sr-only">Forward {seektime} secs</span>
+            <span class="sr-only">Forward {seektime} secs</span>
-		</button>
+        </button>
-		<span class="player-time">
+        <span class="player-time">
-			<span class="sr-only">Time</span>
+            <span class="sr-only">Time</span>
-			<span class="player-duration">00:00</span>
+            <span class="player-duration">00:00</span>
-		</span>
+        </span>
-	</span>
+    </span>
-	<span class="player-controls-sound">
+    <span class="player-controls-right">
-		<input class="inverted sr-only" id="mute{id}" type="checkbox" data-player="mute">
+        <input class="inverted sr-only" id="mute{id}" type="checkbox" data-player="mute">
-		<label id="mute{id}" for="mute{id}">
+        <label id="mute{id}" for="mute{id}">
-			<svg class="icon-muted"><use xlink:href="#icon-muted"></use></svg>
+            <svg class="icon-muted"><use xlink:href="#icon-muted"></use></svg>
-			<svg><use xlink:href="#icon-volume"></use></svg>
+            <svg><use xlink:href="#icon-volume"></use></svg>
-			<span class="sr-only">Toggle Mute</span>
+            <span class="sr-only">Toggle Mute</span>
-		</label>
+        </label>
 
-		<label for="volume{id}" class="sr-only">Volume</label>
+        <label for="volume{id}" class="sr-only">Volume</label>
-		<input id="volume{id}" class="player-volume" type="range" min="0" max="10" step="0.5" value="0" data-player="volume">
+        <input id="volume{id}" class="player-volume" type="range" min="0" max="10" step="0.5" value="0" data-player="volume">
 
-		<input class="sr-only" id="captions{id}" type="checkbox" data-player="captions">
+        <input class="sr-only" id="captions{id}" type="checkbox" data-player="captions">
-		<label for="captions{id}">
+        <label for="captions{id}">
-			<svg class="icon-captions-on"><use xlink:href="#icon-captions-on"></use></svg>
+            <svg class="icon-captions-on"><use xlink:href="#icon-captions-on"></use></svg>
-			<svg><use xlink:href="#icon-captions-off"></use></svg>
+            <svg><use xlink:href="#icon-captions-off"></use></svg>
-			<span class="sr-only">Toggle Captions</span>
+            <span class="sr-only">Toggle Captions</span>
-		</label>
+        </label>
 
-		<button type="button" data-player="fullscreen">
+        <button type="button" data-player="fullscreen">
-			<svg class="icon-exit-fullscreen"><use xlink:href="#icon-exit-fullscreen"></use></svg>
+            <svg class="icon-exit-fullscreen"><use xlink:href="#icon-exit-fullscreen"></use></svg>
-			<svg><use xlink:href="#icon-enter-fullscreen"></use></svg>
+            <svg><use xlink:href="#icon-enter-fullscreen"></use></svg>
-			<span class="sr-only">Toggle Fullscreen</span>
+            <span class="sr-only">Toggle Fullscreen</span>
-		</button>
+        </button>
-	</span>
+    </span>
 </div>

gulpfile.js

@@ -4,59 +4,60 @@
 /*global require, __dirname*/
 /*jshint -W079 */
 
-var fs 			= require("fs"),
+var fs          = require("fs"),
-	path 		= require("path"),
+    path        = require("path"),
-	gulp 		= require("gulp"),
+    gulp        = require("gulp"),
-	gutil 		= require("gulp-util"),
+    gutil       = require("gulp-util"),
-	concat 		= require("gulp-concat"),
+    concat      = require("gulp-concat"),
-	uglify 		= require("gulp-uglify"),
+    uglify      = require("gulp-uglify"),
-	less 		= require("gulp-less"),
+    less        = require("gulp-less"),
-	sass 		= require("gulp-sass"),
+    sass        = require("gulp-sass"),
-	minify 		= require("gulp-minify-css"),
+    minify      = require("gulp-minify-css"),
-	run 		= require("run-sequence"),
+    run         = require("run-sequence"),
-	prefix 		= require("gulp-autoprefixer"),
+    prefix      = require("gulp-autoprefixer"),
-	svgstore 	= require("gulp-svgstore"),
+    svgstore    = require("gulp-svgstore"),
-	svgmin 		= require("gulp-svgmin"),
+    svgmin      = require("gulp-svgmin"),
-	hogan 		= require("gulp-hogan-compile"),
+    hogan       = require("gulp-hogan-compile"),
-	rename 		= require("gulp-rename"),
+    rename      = require("gulp-rename"),
-	s3 			= require("gulp-s3"),
+    s3          = require("gulp-s3"),
-	gzip 		= require("gulp-gzip"),
+    gzip        = require("gulp-gzip"),
-	replace  	= require("gulp-replace"),
+    replace     = require("gulp-replace"),
-	open 		= require("gulp-open");
+    open        = require("gulp-open"),
+    size        = require("gulp-size");
 
 var root = __dirname,
 paths = {
-	plyr: {
+    plyr: {
-		// Source paths
+        // Source paths
-		src: {
+        src: {
-			less: 		path.join(root, "src/less/**/*"),
+            less:       path.join(root, "src/less/**/*"),
-			sass: 		path.join(root, "src/sass/**/*"),
+            sass:       path.join(root, "src/sass/**/*"),
-			js: 		path.join(root, "src/js/**/*"),
+            js:         path.join(root, "src/js/**/*"),
-			sprite: 	path.join(root, "src/sprite/*.svg")
+            sprite:     path.join(root, "src/sprite/*.svg")
-		},
+        },
-		// Output paths
+        // Output paths
-		output: 		path.join(root, "dist/")
+        output:         path.join(root, "dist/")
-	},
+    },
-	docs: {
+    docs: {
-		// Source paths
+        // Source paths
-		src: {
+        src: {
-			less: 		path.join(root, "docs/src/less/**/*"),
+            less:       path.join(root, "docs/src/less/**/*"),
-			js: 		path.join(root, "docs/src/js/**/*"),
+            js:         path.join(root, "docs/src/js/**/*"),
-			templates: 	path.join(root, "docs/src/templates/*.html")
+            templates:  path.join(root, "docs/src/templates/*.html")
-		},
+        },
-		// Output paths
+        // Output paths
-		output: 		path.join(root, "docs/dist/"),
+        output:         path.join(root, "docs/dist/"),
-		// Docs
+        // Docs
-		root: 			path.join(root, "docs/")
+        root:           path.join(root, "docs/")
-	},
+    },
-	upload: [path.join(root, "dist/**"), path.join(root, "docs/dist/**")]
+    upload: [path.join(root, "dist/**"), path.join(root, "docs/dist/**")]
 },
 
 // Task arrays
 tasks = {    
-	less: 	[],
+    less:   [],
-	sass: 	[],
+    sass:   [],
-	js:   	[]
+    js:     []
 },
 
 // Fetch bundles from JSON
@@ -69,88 +70,88 @@ function loadJSON(path) {
 }
 
 var build = {
-	js: function (files, bundle) {
+    js: function (files, bundle) {
-		for (var key in files) {
+        for (var key in files) {
-			(function(key) {
+            (function(key) {
-				var name = "js-" + key;
+                var name = "js-" + key;
-				tasks.js.push(name);
+                tasks.js.push(name);
 
-				gulp.task(name, function () {
+                gulp.task(name, function () {
-					return gulp
+                    return gulp
-						.src(bundles[bundle].js[key])
+                        .src(bundles[bundle].js[key])
-						.pipe(concat(key))
+                        .pipe(concat(key))
-						.pipe(uglify())
+                        .pipe(uglify())
-						.pipe(gulp.dest(paths[bundle].output));
+                        .pipe(gulp.dest(paths[bundle].output));
-				});
+                });
-			})(key);
+            })(key);
-		}
+        }
-	},
+    },
-	less: function(files, bundle) {
+    less: function(files, bundle) {
-		for (var key in files) {
+        for (var key in files) {
-			(function (key) {		
+            (function (key) {       
-				var name = "less-" + key;
+                var name = "less-" + key;
-				tasks.less.push(name);
+                tasks.less.push(name);
 
-				gulp.task(name, function () {
+                gulp.task(name, function () {
-					return gulp
+                    return gulp
-						.src(bundles[bundle].less[key])
+                        .src(bundles[bundle].less[key])
-						.pipe(less())
+                        .pipe(less())
-						.on("error", gutil.log)
+                        .on("error", gutil.log)
-						.pipe(concat(key))
+                        .pipe(concat(key))
-						.pipe(prefix(["last 2 versions"], { cascade: true }))
+                        .pipe(prefix(["last 2 versions"], { cascade: true }))
-						.pipe(minify())
+                        .pipe(minify())
-						.pipe(gulp.dest(paths[bundle].output));
+                        .pipe(gulp.dest(paths[bundle].output));
-				});
+                });
-			})(key);
+            })(key);
-		}
+        }
-	},
+    },
-	sass: function(files, bundle) {
+    sass: function(files, bundle) {
-		for (var key in files) {
+        for (var key in files) {
-			(function (key) {		
+            (function (key) {       
-				var name = "sass-" + key;
+                var name = "sass-" + key;
-				tasks.sass.push(name);
+                tasks.sass.push(name);
 
-				gulp.task(name, function () {
+                gulp.task(name, function () {
-					return gulp
+                    return gulp
-						.src(bundles[bundle].sass[key])
+                        .src(bundles[bundle].sass[key])
-						.pipe(sass())
+                        .pipe(sass())
-						.on("error", gutil.log)
+                        .on("error", gutil.log)
-						.pipe(concat(key))
+                        .pipe(concat(key))
-						.pipe(prefix(["last 2 versions"], { cascade: true }))
+                        .pipe(prefix(["last 2 versions"], { cascade: true }))
-						.pipe(minify())
+                        .pipe(minify())
-						.pipe(gulp.dest(paths[bundle].output));
+                        .pipe(gulp.dest(paths[bundle].output));
-				});
+                });
-			})(key);
+            })(key);
-		}
+        }
-	},
+    },
-	sprite: function() {
+    sprite: function() {
-		// Process Icons
+        // Process Icons
-		gulp.task("sprite", function () {
+        gulp.task("sprite", function () {
-			return gulp
+            return gulp
-				.src(paths.plyr.src.sprite)
+                .src(paths.plyr.src.sprite)
-				.pipe(svgmin({
+                .pipe(svgmin({
-					plugins: [{
+                    plugins: [{
-						removeDesc: true
+                        removeDesc: true
-					}]
+                    }]
-				}))
+                }))
-		        .pipe(svgstore())
+                .pipe(svgstore())
-			    .pipe(gulp.dest(paths.plyr.output));
+                .pipe(gulp.dest(paths.plyr.output));
-		});
+        });
-	},
+    },
-	templates: function() {
+    templates: function() {
-		// Build templates
+        // Build templates
-		gulp.task("templates", function () {
+        gulp.task("templates", function () {
-			return gulp
+            return gulp
-				.src(paths.docs.src.templates)
+                .src(paths.docs.src.templates)
-				.pipe(hogan("templates.js", {
+                .pipe(hogan("templates.js", {
-					wrapper: false,
+                    wrapper: false,
-					templateName: function (file) {
+                    templateName: function (file) {
-						return path.basename(file.relative.replace(/\\/g, "-"), path.extname(file.relative));
+                        return path.basename(file.relative.replace(/\\/g, "-"), path.extname(file.relative));
-					}
+                    }
-				}))
+                }))
-				.pipe(gulp.dest(paths.docs.output));
+                .pipe(gulp.dest(paths.docs.output));
-		});
+        });
-	}
+    }
 };
 
 // Plyr core files
@@ -166,22 +167,22 @@ build.js(bundles.docs.js, "docs");
 
 // Default gulp task
 gulp.task("default", function(){
-	run("templates", tasks.js, tasks.less, "sprite");
+    run("templates", tasks.js, tasks.less, "sprite");
 });
 
 // Build all JS (inc. templates)
 gulp.task("js", function(){
-	run("templates", tasks.js);
+    run("templates", tasks.js);
 });
 
 // Build SASS (for testing, default is LESS)
 gulp.task("sass", function(){
-	run(tasks.sass);
+    run(tasks.sass);
 });
 
 // Watch for file changes
 gulp.task("watch", function () {
-	// Plyr core
+    // Plyr core
     gulp.watch(paths.plyr.src.js, tasks.js);
     gulp.watch(paths.plyr.src.less, tasks.less);
     gulp.watch(paths.plyr.src.sprite, "sprite");
@@ -189,7 +190,7 @@ gulp.task("watch", function () {
     // Docs
     gulp.watch(paths.docs.src.js, tasks.js);
     gulp.watch(paths.docs.src.less, tasks.less);
-	gulp.watch(paths.docs.src.templates, "js");
+    gulp.watch(paths.docs.src.templates, "js");
 });
 
 // Publish a version to CDN and docs
@@ -198,69 +199,78 @@ gulp.task("watch", function () {
 // Some options
 var aws = loadJSON(path.join(root, "aws.json")),
 version = package.version,
-maxAge 	= 31536000, // seconds 1 year
+maxAge  = 31536000, // seconds 1 year
 options = {
-	cdn: {
+    cdn: {
-		headers: {
+        headers: {
-			"Cache-Control": "max-age=" + maxAge + ", no-transform, public",
+            "Cache-Control": "max-age=" + maxAge + ", no-transform, public",
-			"Vary": "Accept-Encoding"
+            "Vary": "Accept-Encoding"
-		},
+        },
-		gzippedOnly: true
+        gzippedOnly: true
-	},
+    },
-	docs: {
+    docs: {
-		headers: {
+        headers: {
-			"Cache-Control": "public, must-revalidate, proxy-revalidate, max-age=0",
+            "Cache-Control": "public, must-revalidate, proxy-revalidate, max-age=0",
-			"Vary": "Accept-Encoding"
+            "Vary": "Accept-Encoding"
-		},
+        },
-		gzippedOnly: true
+        gzippedOnly: true
-	}
+    }
 },
 cdnpath = new RegExp(aws.cdn.bucket + "\/(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)","gi");
 
 // Publish version to CDN bucket
 gulp.task("cdn", function () {
-	console.log("Uploading " + version + " to " + aws.cdn.bucket);
+    console.log("Uploading " + version + " to " + aws.cdn.bucket);
 
-	// Upload to CDN 
+    // Upload to CDN 
-	gulp.src(paths.upload)
+    gulp.src(paths.upload)
-		.pipe(rename(function (path) {
+        .pipe(size({
-		    path.dirname = path.dirname.replace(".", version);
+            showFiles: true,
-		}))
+            gzip: true
-		.pipe(gzip())
+        }))
-		.pipe(s3(aws.cdn, options.cdn));
+        .pipe(rename(function (path) {
+            path.dirname = path.dirname.replace(".", version);
+        }))
+        .pipe(gzip())
+        .pipe(s3(aws.cdn, options.cdn));
 });
 
 // Publish to Docs bucket
 gulp.task("docs", function () {
-	console.log("Uploading " + version + " docs to " + aws.docs.bucket);
+    console.log("Uploading " + version + " docs to " + aws.docs.bucket);
 
-	// Replace versioned files in *.html
+    // Replace versioned files in readme.md
-	gulp.src([paths.docs.root + "*.html"])
+    gulp.src([root + "/readme.md"])
-		.pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
+        .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
-		.pipe(gulp.dest(paths.docs.root))
+        .pipe(gulp.dest(root));
-		.pipe(gzip())
-		.pipe(s3(aws.docs, options.docs));
 
-	// Upload error.html to cdn using docs options
+    // Replace versioned files in *.html
-	gulp.src([paths.docs.root + "error.html"])
+    gulp.src([paths.docs.root + "*.html"])
-		.pipe(gzip())
+        .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
-		.pipe(s3(aws.cdn, options.docs));
+        .pipe(gulp.dest(paths.docs.root))
+        .pipe(gzip())
+        .pipe(s3(aws.docs, options.docs));
+
+    // Upload error.html to cdn using docs options
+    gulp.src([paths.docs.root + "error.html"])
+        .pipe(gzip())
+        .pipe(s3(aws.cdn, options.docs));
 });
 
 // Open the docs site to check it's sweet
 gulp.task("open", function () {
-	console.log("Opening " + aws.docs.bucket + "...");
+    console.log("Opening " + aws.docs.bucket + "...");
 
-	// A file must be specified or gulp will skip the task
+    // A file must be specified or gulp will skip the task
-	// Doesn't matter which file since we set the URL above
+    // Doesn't matter which file since we set the URL above
-	// Weird, I know...
+    // Weird, I know...
-	gulp.src([paths.docs.root + "index.html"])
+    gulp.src([paths.docs.root + "index.html"])
-		.pipe(open("", {
+        .pipe(open("", {
-			url: "http://" + aws.docs.bucket
+            url: "http://" + aws.docs.bucket
-		}));
+        }));
 });
 
 // Do everything 
 gulp.task("publish", function () {
-	run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs", "open");
+    run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs", "open");
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plyr",
-  "version": "1.0.24",
+  "version": "1.0.27",
   "description": "A simple HTML5 media player using custom controls",
   "homepage": "http://plyr.io",
   "main": "gulpfile.js",
@@ -18,6 +18,7 @@
     "gulp-replace": "^0.5.3",
     "gulp-s3": "^0.3.0",
     "gulp-sass": "^1.3.3",
+    "gulp-size": "^1.2.1",
     "gulp-svgmin": "^1.0.0",
     "gulp-svgstore": "^5.0.0",
     "gulp-uglify": "~0.3.1",

readme.md

@@ -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.24/plyr.js` to `https://cdn.plyr.io/1.0.24/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.0.27/plyr.js` to `https://cdn.plyr.io/1.0.27/plyr.js`
 
 ### Bower
 If bower is your thang, you can grab Plyr using:
@@ -51,11 +51,11 @@ More info on setting up dependencies can be found in the [Bower Docs](http://bow
 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.24/plyr.css">
+<link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css">
-<script src="//cdn.plyr.io/1.0.24/plyr.js"></script>
+<script src="//cdn.plyr.io/1.0.27/plyr.js"></script>
 ```
 
-You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.24/sprite.svg`.
+You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.27/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. 
@@ -365,7 +365,7 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt
   </tbody>
 </table>
 
-&sup1; iPhone forces the native player for `<video>` so no customisation possible
+&sup1; iPhone forces the native player for `<video>` so no customisation possible. `<audio>` elements have volume controls disabled.
 
 &sup2; Native player used (no support for `<progress>` or `<input type="range">`)
 

src/js/plyr.js

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.0.24
+// plyr.js v1.0.27
-// https://github.com/sampotts/plyr
+// https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
 // Credits: http://paypal.github.io/accessible-html5-video-player/
@@ -88,7 +88,7 @@
                             "<span>0</span>% buffered",
                         "</progress>",
                     "</div>",
-                    "<span class='player-controls-playback'>",
+                    "<span class='player-controls-left'>",
                         "<button type='button' data-player='restart'>",
                             "<svg><use xlink:href='#icon-restart'></use></svg>",
                             "<span class='sr-only'>Restart</span>",
@@ -114,7 +114,7 @@
                             "<span class='player-duration'>00:00</span>",
                         "</span>",
                     "</span>",
-                    "<span class='player-controls-sound'>",
+                    "<span class='player-controls-right'>",
                         "<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>",
                         "<label id='mute{id}' for='mute{id}'>",
                             "<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>",
@@ -137,7 +137,7 @@
                     "</span>",
                 "</div>"
             ].join("\n");
-    })()
+        })()
     };
 
     // Debugging
@@ -151,7 +151,7 @@
     // Unfortunately, due to mixed support, UA sniffing is required
     function _browserSniff() {
         var nAgt = navigator.userAgent,
-            browserName = navigator.appName,
+            name = navigator.appName,
             fullVersion = ""+parseFloat(navigator.appVersion),
             majorVersion = parseInt(navigator.appVersion,10),
             nameOffset,
@@ -160,22 +160,22 @@
 
         // MSIE 11
         if ((navigator.appVersion.indexOf("Windows NT") !== -1) && (navigator.appVersion.indexOf("rv:11") !== -1)) {
-            browserName = "IE";
+            name = "IE";
             fullVersion = "11;";
         }
         // MSIE
         else if ((verOffset=nAgt.indexOf("MSIE")) !== -1) {
-            browserName = "IE";
+            name = "IE";
             fullVersion = nAgt.substring(verOffset+5);
         }
         // Chrome
         else if ((verOffset=nAgt.indexOf("Chrome")) !== -1) {
-            browserName = "Chrome";
+            name = "Chrome";
             fullVersion = nAgt.substring(verOffset+7);
         }
         // Safari
         else if ((verOffset=nAgt.indexOf("Safari")) !== -1) {
-            browserName = "Safari";
+            name = "Safari";
             fullVersion = nAgt.substring(verOffset+7);
             if ((verOffset=nAgt.indexOf("Version")) !== -1) {
                 fullVersion = nAgt.substring(verOffset+8);
@@ -183,15 +183,15 @@
         }
         // Firefox
         else if ((verOffset=nAgt.indexOf("Firefox")) !== -1) {
-            browserName = "Firefox";
+            name = "Firefox";
             fullVersion = nAgt.substring(verOffset+8);
         }
         // In most other browsers, "name/version" is at the end of userAgent 
         else if ( (nameOffset=nAgt.lastIndexOf(" ")+1) < (verOffset=nAgt.lastIndexOf("/")) ) {
-            browserName = nAgt.substring(nameOffset,verOffset);
+            name = nAgt.substring(nameOffset,verOffset);
             fullVersion = nAgt.substring(verOffset+1);
-            if (browserName.toLowerCase()==browserName.toUpperCase()) {
+            if (name.toLowerCase()==name.toUpperCase()) {
-                browserName = navigator.appName;
+                name = navigator.appName;
             }
         }
         // Trim the fullVersion string at semicolon/space if present
@@ -207,8 +207,13 @@
             fullVersion = ""+parseFloat(navigator.appVersion); 
             majorVersion = parseInt(navigator.appVersion,10);
         }
+
         // Return data
-        return [browserName, majorVersion];
+        return {
+            name:       name, 
+            version:    majorVersion, 
+            ios:        /(iPad|iPhone|iPod)/g.test(navigator.platform)
+        };
     }
 
     // Check for mime type support against a player instance
@@ -312,6 +317,17 @@
     function _toggleHandler(element, events, callback, toggle) {
         events = events.split(" ");
 
+        // If a nodelist is passed, call itself on each node
+        if(element instanceof NodeList) {
+            for (var x = 0; x < element.length; x++) {
+                if (element[x] instanceof Node) {
+                    _toggleHandler(element[x], arguments[1], arguments[2], arguments[3]);
+                }
+            }
+            return;
+        }
+
+        // If a single node is passed, bind the event listener
         for (var i = 0; i < events.length; i++) {
             element[toggle ? "addEventListener" : "removeEventListener"](events[i], callback, false);
         }
@@ -327,6 +343,35 @@
         _toggleHandler(element, events, callback, false);
     }
 
+    // Trigger event
+    function _triggerEvent(element, event) {
+        // Create faux event
+        var fauxEvent = document.createEvent("MouseEvents");
+
+        // Set the event type
+        fauxEvent.initEvent(event, true, true);
+
+        // Dispatch the event
+        element.dispatchEvent(fauxEvent);
+    }
+
+    // Toggle checkbox
+    function _toggleCheckbox(event) {
+        // Only listen for return key
+        if(event.keyCode && event.keyCode != 13) {
+            return true;
+        }
+
+        // Toggle the checkbox
+        event.target.checked = !event.target.checked;
+
+        // Set the attribute for CSS hooks
+        event.target[event.target.checked ? "setAttribute" : "removeAttribute"]("checked", "");
+
+        // Trigger change event
+        _triggerEvent(event.target, "change");
+    }
+
     // Get percentage
     function _getPercentage(current, max) {
         if(current === 0 || max === 0 || isNaN(current) || isNaN(max)) {
@@ -491,7 +536,7 @@
 
             if (config.captions.defaultActive) {
                 _toggleClass(player.container, config.classes.captions.active, true);
-                player.buttons.captions.setAttribute("checked", "checked");
+                player.buttons.captions.setAttribute("checked", "");
             }
         }
 
@@ -585,9 +630,12 @@
                 player.buttons.restart          = _getElement(config.selectors.buttons.restart);
                 player.buttons.rewind           = _getElement(config.selectors.buttons.rewind);
                 player.buttons.forward          = _getElement(config.selectors.buttons.forward);
+                player.buttons.fullscreen       = _getElement(config.selectors.buttons.fullscreen);
+
+                // Inputs
                 player.buttons.mute             = _getElement(config.selectors.buttons.mute);
                 player.buttons.captions         = _getElement(config.selectors.buttons.captions);
-                player.buttons.fullscreen       = _getElement(config.selectors.buttons.fullscreen);
+                player.checkboxes               = _getElements("[type='checkbox']");
 
                 // Progress
                 player.progress = {};
@@ -614,6 +662,7 @@
             }
             catch(e) {
                 _log("It looks like there's a problem with your controls html. Bailing.", true);
+
                 return false;
             }
         }
@@ -644,7 +693,7 @@
             player.media.removeAttribute("controls");
 
             // Set media type
-            player.type = (player.media.tagName == "VIDEO" ? "video" : "audio");
+            player.type = player.media.tagName.toLowerCase();
 
             // Add type class
             _toggleClass(player.container, config.classes[player.type], true);
@@ -652,6 +701,11 @@
             // If there's no autoplay attribute, assume the video is stopped and add state class
             _toggleClass(player.container, config.classes.stopped, (player.media.getAttribute("autoplay") === null));
 
+            // Add iOS class
+            if(player.browser.ios) {
+                _toggleClass(player.container, "ios", true);
+            }
+
             // Inject the player wrapper
             if(player.type === "video") {
                 // Create the wrapper div
@@ -727,10 +781,10 @@
                     _showCaptions(player);
 
                     // If IE 10/11 or Firefox 31+ or Safari 7+, don"t use native captioning (still doesn"t work although they claim it"s now supported)
-                    if ((player.browserName === "IE" && player.browserMajorVersion === 10) || 
+                    if ((player.browser.name === "IE" && player.browser.version === 10) || 
-                            (player.browserName === "IE" && player.browserMajorVersion === 11) || 
+                            (player.browser.name === "IE" && player.browser.version === 11) || 
-                            (player.browserName === "Firefox" && player.browserMajorVersion >= 31) || 
+                            (player.browser.name === "Firefox" && player.browser.version >= 31) || 
-                            (player.browserName === "Safari" && player.browserMajorVersion >= 7)) {
+                            (player.browser.name === "Safari" && player.browser.version >= 7)) {
                         // Debugging
                         _log("Detected IE 10/11 or Firefox 31+ or Safari 7+.");
 
@@ -802,7 +856,7 @@
                     }
 
                     // If Safari 7+, removing track from DOM [see "turn off native caption rendering" above]
-                    if (player.browserName === "Safari" && player.browserMajorVersion >= 7) {
+                    if (player.browser.name === "Safari" && player.browser.version >= 7) {
                         _log("Safari 7+ detected; removing track from DOM.");
 
                         // Find all <track> elements
@@ -888,7 +942,11 @@
             }
 
             // Set the current time
-            player.media.currentTime = targetTime.toFixed(1);
+            // Try/catch incase the media isn't set and we're calling seek() from source() and IE moans
+            try {
+                player.media.currentTime = targetTime.toFixed(1);
+            }
+            catch(e) {}
 
             // Logging
             _log("Seeking to " + player.media.currentTime + " seconds");
@@ -1213,22 +1271,6 @@
 
             // Handle user exiting fullscreen by escaping etc
             _on(document, fullscreen.fullScreenEventName, _toggleFullscreen);
-
-            // Click video
-            if(player.type === "video" && config.click) {
-                _on(player.videoContainer, "click", function() {
-                    if(player.media.paused) {
-                        _play();
-                    }
-                    else if(player.media.ended) {
-                        _seek();
-                        _play();
-                    }
-                    else {
-                        _pause();
-                    }
-                });
-            }
             
             // Time change on media
             _on(player.media, "timeupdate seeking", _timeUpdate);
@@ -1240,15 +1282,18 @@
             _on(player.buttons.seek, "change input", _seek);
 
             // Captions
-            _on(player.buttons.captions, "click", function() { 
+            _on(player.buttons.captions, "change", function() { 
                 _toggleCaptions(this.checked);
             });
 
-            // Clear captions at end of video
+            // Handle the media finishing
             _on(player.media, "ended", function() {
+                // Clear 
                 if(player.type === "video") {
                     player.captionsContainer.innerHTML = "";
                 }
+
+                // Reset UI
                 _checkPlaying();
             });
 
@@ -1266,6 +1311,25 @@
 
             // Loading
             _on(player.media, "waiting canplay seeked", _checkLoading);
+
+            // Toggle checkboxes on return key (as they look like buttons)
+            _on(player.checkboxes, "keyup", _toggleCheckbox);
+
+            // Click video
+            if(player.type === "video" && config.click) {
+                _on(player.videoContainer, "click", function() {
+                    if(player.media.paused) {
+                        _play();
+                    }
+                    else if(player.media.ended) {
+                        _seek();
+                        _play();
+                    }
+                    else {
+                        _pause();
+                    }
+                });
+            }
         }
 
         function _init() {
@@ -1273,16 +1337,14 @@
             fullscreen = _fullscreen();
 
             // Sniff 
-            player.browserInfo = _browserSniff();
+            player.browser = _browserSniff();
-            player.browserName = player.browserInfo[0];
-            player.browserMajorVersion = player.browserInfo[1];
 
             // Debug info
-            _log(player.browserName + " " + player.browserMajorVersion);
+            _log(player.browser.name + " " + player.browser.version);
 
             // If IE8, stop customization (use fallback)
             // If IE9, stop customization (use native controls)
-            if (player.browserName === "IE" && (player.browserMajorVersion === 8 || player.browserMajorVersion === 9) ) {
+            if (player.browser.name === "IE" && (player.browser.version === 8 || player.browser.version === 9) ) {
                 _log("Browser not suppported.", true);
                 return false;
             }
@@ -1315,9 +1377,14 @@
 
             // Listeners
             _listeners();
+
+            // Successful setup
+            return true;
         }
 
-        _init();
+        if(!_init()) {
+            return {};
+        }
 
         return {
             media:              player.media,
@@ -1348,7 +1415,8 @@
         }
 
         // Get the players 
-        var elements = document.querySelectorAll(config.selectors.container), players = [];
+        var elements    = document.querySelectorAll(config.selectors.container), 
+            players     = [];
 
         // Create a player instance for each element
         for (var i = elements.length - 1; i >= 0; i--) {
@@ -1357,14 +1425,18 @@
 
             // Disabled for <video> for iPhone
             // Since it doesn't allow customisation
-            if (element.querySelectorAll("audio, video")[0].tagName === "VIDEO" 
+            if (element.querySelectorAll("audio, video")[0].tagName.toLowerCase() === "video"
                 && /iPhone/i.test(navigator.userAgent)) {
                 continue;
             }
 
             // Setup a player instance and add to the element
             if(typeof element.plyr === "undefined") { 
-                element.plyr = new Plyr(element);
+                // Create new instance
+                var instance = new Plyr(element);
+
+                // Set plyr to false if setup failed
+                element.plyr = (Object.keys(instance).length ? instance : false);
             }
 
             // Add to return array