Version bump

# Conflicts:
#	changelog.md
#	dist/plyr.js

.gitignore

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

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,76 @@
 # Changelog
 
+## v1.2.0
+- Added YouTube support.
+
+## v1.1.13
+- Added icon prefix option for when using default controls
+
+## v1.1.13
+- Logic tweaks for hiding controls in fullscreen
+
+## v1.1.12
+- Bug fix for Chrome Canary
+
+## v1.1.11
+- Bug fix 
+
+## v1.1.10
+- Bug fix 
+
+## v1.1.9
+- Bug fix for 1.1.8
+
+## v1.1.8
+- setVolume API method improvements (Fixes #83)
+
+## v1.1.7
+- Restore classname on destroy()
+
+## v1.1.6
+- New API methods (fixes #77), Fix for non strict mode (fixes #78)
+
+## v1.1.5
+- Fix for incorrect `isFullscreen()` return value in Mozilla (Fixes #38)
+
+## v1.1.4
+- Minor bug fixes
+
+## v1.1.3
+- Fixes for random id used in controls with multiple instances and one call to setup
+- Audio player UI improvements
+
+## 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
+
 ## v1.0.25
 - Fixes for iOS volume controls (hidden)
 - Classnames for left/right controls changed
@@ -93,4 +164,4 @@
 - Return instances of Plyr to the element
 
 ## v1.0.0
-- Initial release
+- Initial release

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/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

@@ -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.25/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.2.0/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,109 @@
 <!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.25/plyr.css">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.0/plyr.css?1">
 
-		<!-- Docs styles -->
+        <!-- Docs styles -->
-		<link rel="stylesheet" href="//cdn.plyr.io/1.0.25/docs.css">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.0/docs.css?2">
-	</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 by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a></p>
-			<a href="https://github.com/selz/plyr" target="_blank" class="btn">Download on GitHub</a>
+            <nav>
-		</header>
+                <ul>
+                    <li>
+                        <a href="https://github.com/selz/plyr" target="_blank" class="btn btn-primary">Download on GitHub</a>
+                        <span class="btn-count js-stargazers-count">&hellip;</span>
+                    </li>
+                    <li>
+                        <a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=http%3A%2F%2Fplyr.io&via=Sam_Potts" target="_blank" class="btn js-popup" data-window-height="250" data-window-width="500">Tweet</a>
+                        <span class="btn-count js-tweet-count">&hellip;</span>
+                    </li>
+                </ul>
+            </nav>
+        </header>
 
-		<main>
+        <main role="main" id="main">
-			<section class="example-video">
+            <nav class="btn-bar nav-panel">
-				<div class="player">
+                <ul>
-					<video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
+                    <li><a href="#video" class="btn active btn-small">Video</a></li>
-						<!-- Video files -->
+                    <li><a href="#youtube" class="btn btn-small">YouTube</a></li>
-						<source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
+                    <li><a href="#audio" class="btn btn-small">Audio</a></li>
-						<source src="//cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
+                </ul>
-						
+            </nav>
-						<!-- Text track file -->
+            <div class="panels">
-						<track kind="captions" label="English" srclang="en" src="//cdn.selz.com/plyr/1.0/en.vtt" default>
+                <section class="panel example-video active" id="video">
-						
+                    <div class="player">
-						<!-- Fallback for browsers that don't support the <video> element -->
+                        <video poster="https://cdn.plyr.io/static/poster.jpg" controls crossorigin>
-						<div>
+                            <!-- Video files -->
-							<a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
+                            <source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
-						</div>
+                            <source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
-					</video>
+                            
-				</div>
+                            <!-- Text track file -->
-				<small>Big Buck Bunny. More info can be found at <a href="https://peach.blender.org" target="_blank">peach.blender.org</a>.</small>
+                            <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/en.vtt" default>
-			</section>
+                            
+                            <!-- Fallback for browsers that don't support the <video> element -->
+                            <a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
+                        </video>
+                    </div>
+                    <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 class="panel example-video" id="youtube">
+                    <div class="player">
+                        <div data-video-id="Au87oAJ2jeE" data-type="youtube"></div>
+                    </div>
+                    <small>Envato's "Made By" interview of <a href="https://www.youtube.com/watch?v=Au87oAJ2jeE" target="_blank">Dan Cederholm</a> from <a href="https://dribbble.com" target="_blank">Dribbble</a>.</small>
+                </section>
+                <section class="panel example-audio" id="audio">
+                    <div class="player">
+                        <audio controls>
+                            <!-- 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.ogg" type="audio/ogg">
+                            
+                            <!-- Fallback for browsers that don't support the <audio> element -->
+                            <a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
+                        </audio>
+                    </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>
+                </section>
+            </div>
+        </main>
 
-			<section class="example-audio">
+        <!-- Load SVG defs -->
-				<div class="player">
+        <!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
-					<audio controls>
+        <script>
-						<!-- Audio files -->
+        (function(d, u){
-						<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
+            var a = new XMLHttpRequest(),
-						<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
+                b = d.body;
-						
-						<!-- Fallback for browsers that don't support the <audio> element -->
-						<div>
-							<a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
-						</div>
-					</audio>
-				</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>
-			</section>
-		</main>
 
-		<footer>
+            // Check for CORS support
-			<p>Used by &hellip;</p>
+            // If you're loading from same domain, you can remove the if statement
-			<a href="https://selz.com" target="_blank" class="logo">
+            if("withCredentials" in a) {
-				<img src="https://d33i624pw6jj68.cloudfront.net/static/img/logos/selz.svg" alt="Selz">
+                a.open("GET", u, true);
-			</a>
+                a.send();
-		</footer>
+                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.2.0/sprite.svg");
+        </script>
 
-		<!-- Load SVG defs -->
+        <!-- Plyr core script -->
-		<!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
+        <script src="https://cdn.plyr.io/1.2.0/plyr.js?1"></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.25/sprite.svg");
-		</script>
 
-		<!-- Plyr core script -->
+        <!-- Docs script -->
-		<script src="//cdn.plyr.io/1.0.25/plyr.js"></script>
+        <script src="https://cdn.plyr.io/1.2.0/docs.js?1"></script>
-
+    </body>
-		<!-- Docs script -->
+</html>
-		<script src="//cdn.plyr.io/1.0.25/docs.js"></script>
-	</body>
-</html>

docs/src/js/docs.js

@@ -7,13 +7,169 @@
 // Setup the player
 plyr.setup({
 	debug: 	true,
+	volume: 9,
 	title: 	"Video demo",
 	html: 	templates.controls.render({}),
 	captions: {
 		defaultActive: true
+	},
+	onSetup: function() {
+		if(!("media" in this)) {
+			return;
+		}
+
+		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);
+		}
 	}
 });
 
+// General functions
+(function() { 
+	// Popup
+	function popup(event) {
+		// Prevent the link opening
+		if(event.target.nodeName.toLowerCase() == "a") {
+			if(event.preventDefault) { 
+				event.preventDefault();
+			}
+			else {
+				event.returnValue = false;
+			}
+		}
+
+		var link 	= event.target,
+			url		= link.href,
+			width 	= link.getAttribute("data-window-width") || 600,
+			height 	= link.getAttribute("data-window-height") || 600,
+			name 	= link.getAttribute("data-window-name") || "popup";
+
+		// If window exists, just focus it
+		if(window["window-"+name] && !window["window-"+name].closed) {
+			window["window-"+name].focus();
+		}
+		else {
+			// Get position
+			var left = window.screenLeft !== undefined ? window.screenLeft : screen.left;
+			var top = window.screenTop !== undefined ? window.screenTop : screen.top;
+
+			// Open in the centre of the screen
+			var x = (screen.width / 2) - (width / 2) + left,
+				y = (screen.height / 2) - (height / 2) + top;
+
+			// Open that window
+			window["window-"+name] = window.open(url, name, "top=" + y +",left="+ x +",width=" + width + ",height=" + height);
+
+			// Focus new window
+			window["window-"+name].focus();
+		}
+	}
+
+	// Trigger popups
+	document.querySelector(".js-popup").addEventListener("click", popup);
+
+	// Get JSONP
+	function getJSONP(url, callback) {
+	    var name = "jsonp_callback_" + Math.round(100000 * Math.random());
+
+	    // Cleanup to prevent memory leaks and hit original callback
+	    window[name] = function(data) {
+	        delete window[name];
+	        document.body.removeChild(script);
+	        callback(data);
+	    };
+
+	    // Create a faux script
+	    var script = document.createElement("script");
+	    script.setAttribute("src", url + (url.indexOf("?") >= 0 ? "&" : "?") + "callback=" + name);
+
+	    // Inject to the body
+	    document.body.appendChild(script);
+	}
+
+	// Get star count
+	var storageSupported = ("sessionStorage" in window),
+		selectors = {
+			github: 	".js-stargazers-count",
+			twitter: 	".js-tweet-count"
+		};
+
+	// Display the count next to the button
+	function displayCount(selector, count) {
+		document.querySelector(selector).innerHTML = count;
+	}
+
+	// Add star
+	function formatGitHubCount(count) {
+		return "&bigstar; " + count;
+	}
+
+	// Check if it's in session storage first
+	if(storageSupported && "github_stargazers" in window.sessionStorage) {
+		displayCount(selectors.github, formatGitHubCount(window.sessionStorage.github_stargazers));
+	}
+	else {
+		getJSONP("https://api.github.com/repos/selz/plyr?access_token=a46ac653210ba6a6be44260c29c333470c3fbbf5", function (json) {
+			if (json && typeof json.data.stargazers_count !== "undefined") {
+				// Update UI 
+				displayCount(selectors.github, formatGitHubCount(json.data.stargazers_count));
+
+				// Store in session storage
+				window.sessionStorage.github_stargazers = json.data.stargazers_count;
+			}
+		});
+	}
+
+	// Get tweet count
+	if(storageSupported && "tweets" in window.sessionStorage) {
+		displayCount(selectors.twitter, window.sessionStorage.tweets);
+	}
+	else {
+		getJSONP("https://cdn.api.twitter.com/1/urls/count.json?url=plyr.io", function (json) {
+			if (json && typeof json.count !== "undefined") {
+				// Update UI 
+				displayCount(selectors.twitter, json.count);
+
+				// Store in session storage
+				window.sessionStorage.tweets = json.count;
+			}
+		});
+	}
+
+	// Tabs
+	var tabs = document.querySelectorAll(".nav-panel a"),
+		panels = document.querySelectorAll(".panels > .panel"),
+		activeClass = "active";
+
+	for (var i = tabs.length - 1; i >= 0; i--) {
+		tabs[i].addEventListener("click", togglePanel);
+	}
+
+	function togglePanel(event) {
+		event.preventDefault();
+
+		var tab = event.target,
+			panel = document.querySelector(tab.getAttribute("href"));
+
+		for (var i = panels.length - 1; i >= 0; i--) {
+			panels[i].classList.remove(activeClass);
+		}
+
+		for (var x = tabs.length - 1; x >= 0; x--) {
+			tabs[x].classList.remove(activeClass);
+		}
+
+		panel.classList.add(activeClass);
+		event.target.classList.add(activeClass);
+	}
+})();
+
 // Google analytics 
 // For demo site (http://[www.]plyr.io) only
 if(document.domain.indexOf("plyr.io") > -1) {

docs/src/less/components/base.less

@@ -0,0 +1,45 @@
+// ==========================================================================
+// Base layout
+// ==========================================================================
+
+// BORDER-BOX ALL THE THINGS! 
+// http://paulirish.com/2012/box-sizing-border-box-ftw/
+*, *::after, *::before {  
+    box-sizing: border-box; 
+}
+
+// Base
+html {
+    font-size: 100%;
+}
+body {
+    font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    background: @body-background;
+    line-height: 1.5;
+    text-align: center;
+    color: @gray;
+    .font-smoothing(on);
+}
+
+// Header
+header {
+    padding: @padding-base;
+    margin-bottom: @padding-base;
+
+    p {
+        .font-size(18);
+    }
+    @media (min-width: @screen-sm) {
+        padding-top: (@padding-base * 3);
+        padding-bottom: (@padding-base * 3);
+    }
+}
+
+// Sections
+section {
+    padding-bottom: @padding-base;
+
+    @media (min-width: @screen-sm) {
+        padding-bottom: (@padding-base * 2);
+    }
+}

docs/src/less/components/buttons.less

@@ -0,0 +1,144 @@
+// ==========================================================================
+// Buttons
+// ==========================================================================
+
+nav {
+	ul {
+		list-style: none;
+		margin: 0;
+		padding: 0;
+		font-size: 0;
+	}
+	li {
+		display: inline-block;
+		margin-top: (@padding-base / 2);
+		.font-size();
+		white-space: nowrap;
+	}
+	li + li {
+		margin-left: @padding-base;
+	}
+}
+
+// Tabs
+.btn-bar {
+	position: relative;
+	margin: 0 auto @padding-base;
+	max-width: @example-width-video;
+
+	&::before {
+		content: "";
+		position: absolute;
+		top: 50%;
+		left: 0;
+		right: 0;
+		height: 1px;
+		background: @gray-lighter;
+	}
+
+	ul {
+		position: relative;
+		z-index: 1;
+		display: inline-block;
+		user-select: none;
+	}
+	li {
+		margin: 0;
+
+		&:first-child .btn {
+			border-radius: 4px 0 0 4px;
+		}
+		&:last-child .btn {
+			border-radius: 0 4px 4px 0;
+		}
+		& + li .btn {
+			margin-left: -1px;
+		}
+	}
+	.btn {
+		display: block;
+		border-radius: 0;
+	}
+	.active {
+		&:extend(.btn-primary);
+	}
+	.btn.active {
+		box-shadow: inset 0 1px 1px rgba(0,0,0, .2);
+		position: relative;
+		z-index: 1;
+	}
+
+	@media (min-width: 560px) {
+		margin-bottom: (@padding-base * 2);
+	}
+}
+
+// Shared 
+.btn,
+.btn-count {
+	display: inline-block;
+	vertical-align: middle;
+	border-radius: @border-radius-base;
+	font-weight: 600;
+	user-select: none;
+}
+
+// Buttons 
+.btn {
+	padding: (@padding-base / 2) @padding-base;
+	background: @body-background;
+	border: 1px solid @gray-light;
+	box-shadow: inset 0 1px 0 #fff, 0 1px 1px rgba(0,0,0, .05);
+	text-shadow: 0 1px 1px #fff;
+	color: @gray;
+
+	&:hover,
+	&:focus {
+		background-color: #fff;
+		border-color: darken(@gray-light, 5%);
+		color: @link-color;
+		outline: 0;
+	}
+}
+.btn-primary {
+	background: linear-gradient(@link-color, darken(@link-color, 3%));
+	border-color: darken(@link-color, 10%);
+	box-shadow: 0 1px 1px rgba(0,0,0, .15);
+	text-shadow: 0 1px 1px rgba(0,0,0, .1);
+	color: #fff;
+	
+	&:hover,
+	&:focus {
+		color: #fff;
+		border-color: darken(@link-color, 20%);
+	}
+}
+.btn-small {
+	padding-top: ceil(@padding-base / 3);
+	padding-bottom: ceil(@padding-base / 3);
+}
+
+// Count bubble
+.btn-count {
+	position: relative;
+	margin-left: 6px;
+	padding: ((@padding-base / 2) - 1px);
+	background: @body-background;
+	border: 1px solid @gray-light;
+
+	&::before {
+		content: "";
+		position: absolute;
+		display: block;
+		width: @arrow-size;
+		height: @arrow-size;
+		left: 1px;
+		top: 50%;
+		margin-top: -(@arrow-size / 2);
+
+		background: inherit;
+		border: inherit;
+		border-width: 1px 0 0 1px;
+		transform: rotate(-45deg) translate(-50%, -50%);
+	}
+}

docs/src/less/components/error.less

@@ -0,0 +1,19 @@
+// ==========================================================================
+// Errors (AWS pages)
+// ==========================================================================
+
+// Error page
+html.error,
+.error body {
+    height: 100%;
+}
+.error body {
+    width: 100%;
+    display: table;
+    table-layout: fixed;
+}
+.error main {
+    display: table-cell;
+    width: 100%;
+    vertical-align: middle;
+}

docs/src/less/components/examples.less

@@ -0,0 +1,39 @@
+// ==========================================================================
+// Examples
+// ==========================================================================
+
+// Example players
+.example-audio .player,
+.example-video .player {
+    margin: 0 auto @padding-base;
+
+    &-controls {
+        border-radius: 0 0 @border-radius-base @border-radius-base;
+    }
+}
+.example-audio .player {
+    max-width: @example-width-audio;
+
+    &-controls {
+        border-radius: @border-radius-base;
+    }
+    &-progress {
+        border-radius: @border-radius-base @border-radius-base 0 0;
+        overflow: hidden;
+    }
+}
+.example-video .player {
+    max-width: @example-width-video;
+
+    video,
+    iframe {
+        border-radius: @border-radius-base @border-radius-base 0 0;
+    }
+    iframe {
+        -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
+    }
+    &-fullscreen,
+    &.fullscreen-active {
+        max-width: none;
+    }
+}

docs/src/less/components/panels.less

@@ -0,0 +1,13 @@
+// ==========================================================================
+// Panels
+// ==========================================================================
+
+// Panels
+.panel {
+    display: none;
+
+    &.active {
+        display: block;
+        animation: fade-in .3s ease;
+    }
+}

docs/src/less/components/type.less

@@ -0,0 +1,47 @@
+// ==========================================================================
+// Typography
+// ==========================================================================
+
+// Headings
+h1,
+h2 {
+    letter-spacing: -.025em;
+    color: #2E3C44;
+    margin: 0 0 (@padding-base / 2);
+    line-height: 1.2;
+    .font-smoothing();
+}
+h1 {
+    .font-size(64);
+    color: #3498DB;
+}
+
+// Paragraph and small
+p,
+small {
+    margin: 0 0 @padding-base;
+}
+small {
+    display: block;
+    padding: 0 (@padding-base / 2);
+    .font-size(14);
+}
+
+// Links
+a {
+    text-decoration: none;
+    color: @link-color;
+    border-bottom: 1px solid currentColor;
+    transition: background .3s ease, color .3s ease;
+
+    &:hover,
+    &:focus {
+        color: @gray-dark;
+    }
+    &:focus {
+        .tab-focus();
+    }
+    &.logo {
+        border: 0;
+    }
+}

docs/src/less/docs.less

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

docs/src/less/lib/animation.less

@@ -0,0 +1,9 @@
+// ==========================================================================
+// Animations
+// ==========================================================================
+
+// Fade
+@keyframes fade-in {
+	0% 		{ opacity: 0 }
+	100% 	{ opacity: 1 }
+}

docs/src/less/lib/fontface.less

@@ -1,16 +1,18 @@
+// ==========================================================================
+// Fonts
+// ==========================================================================
+
 @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");
+    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");
+    font-style:   normal;
-	font-style:   normal;
+    font-weight:  600;
-	font-weight:  600;
 }

docs/src/less/lib/mixins.less

@@ -5,38 +5,37 @@
 // 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-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), 3);
-	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/less/variables.less

@@ -0,0 +1,30 @@
+// ==========================================================================
+// Variables
+// ==========================================================================
+
+// Colors
+@blue:                      #3498db;
+@gray-dark:                 #343f4a;
+@gray:                      #55646b;
+@gray-light:                #cbd0d3;
+@gray-lighter:              #dbe3e8;
+@off-white:                 #f2f5f7;
+
+// Base
+@body-background: 			@off-white;
+
+// Elements
+@link-color:                @blue;
+@padding-base:              20px;
+@arrow-size:                8px;
+
+// Breakpoints
+@screen-sm:                 480px;
+@screen-md:                 768px;
+
+// Radii
+@border-radius-base: 		4px;
+
+// Examples
+@example-width-audio: 		520px;
+@example-width-video: 		1200px;

docs/src/templates/controls.html

@@ -1,62 +1,66 @@
 <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-left">
+    <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">Current time</span>
-			<span class="player-duration">00:00</span>
+            <span class="player-current-time">00:00</span>
-		</span>
+        </span>
-	</span>
+        <span class="player-time">
-	<span class="player-controls-right">
+            <span class="sr-only">Duration</span>
-		<input class="inverted sr-only" id="mute{id}" type="checkbox" data-player="mute">
+            <span class="player-duration">00:00</span>
-		<label id="mute{id}" for="mute{id}">
+        </span>
-			<svg class="icon-muted"><use xlink:href="#icon-muted"></use></svg>
+    </span>
-			<svg><use xlink:href="#icon-volume"></use></svg>
+    <span class="player-controls-right">
-			<span class="sr-only">Toggle Mute</span>
+        <input class="inverted sr-only" id="mute{id}" type="checkbox" data-player="mute">
-		</label>
+        <label id="mute{id}" for="mute{id}">
+            <svg class="icon-muted"><use xlink:href="#icon-muted"></use></svg>
+            <svg><use xlink:href="#icon-volume"></use></svg>
+            <span class="sr-only">Toggle Mute</span>
+        </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,30 +167,30 @@ 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");
+    gulp.watch(paths.plyr.src.sprite, ["sprite"]);
 
     // 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");
 });

package.json

@@ -1,27 +1,28 @@
 {
   "name": "plyr",
-  "version": "1.0.25",
+  "version": "1.2.0",
   "description": "A simple HTML5 media player using custom controls",
   "homepage": "http://plyr.io",
   "main": "gulpfile.js",
   "dependencies": {},
   "devDependencies": {
-    "gulp": "~3.8.6",
+    "gulp": "^3.8.6",
     "gulp-autoprefixer": "^0.0.8",
-    "gulp-concat": "~2.3.3",
+    "gulp-concat": "^2.3.3",
     "gulp-gzip": "^1.0.0",
     "gulp-hogan-compile": "^0.4.1",
-    "gulp-less": "~1.3.1",
+    "gulp-less": "^1.3.1",
-    "gulp-minify-css": "~0.3.6",
+    "gulp-minify-css": "^0.3.6",
     "gulp-open": "^0.3.2",
     "gulp-rename": "^1.2.0",
     "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",
+    "gulp-uglify": "^0.3.1",
-    "gulp-util": "~2.2.20",
+    "gulp-util": "^2.2.20",
     "run-sequence": "^0.3.6"
   },
   "scripts": {

readme.md

@@ -3,20 +3,21 @@ 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.
+- **[Customisable](#html)** - 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.
 - **Audio & Video** - support for both formats.
-- **API** - toggle playback, volume, seeking, and more.
+- **[Embed](#embed)** - support for YouTube (Vimeo soon).
-- **Fullscreen** - supports native fullscreen with fallback to "full window" modes.
+- **[API](#api)** - toggle playback, volume, seeking, and more.
+- **[Fullscreen](#fullscreen)** - supports native fullscreen with fallback to "full window" modes.
 - **No dependencies** - written in vanilla JavaScript, no jQuery required. 
 
 Oh and yes, it works with Bootstrap. 
@@ -25,11 +26,11 @@ Oh and yes, it works with Bootstrap.
 Check out [the changelog](changelog.md)
 
 ## Planned development
-- Accept a string selector, a node, or a nodelist for the `container` property of `selectors`.
+- Playlists
+- ~~YouTube~~ and Vimeo support
+- Playback speed
 - Multiple language captions (with selection)
-- Playlists (audio and video)
+- Audio captions
-- Set source by API
-- Tooltip option (for seeking and controls)
 ... and whatever else has been raised in [issues](https://github.com/Selz/plyr/issues)
 
 If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or of course, forking and sending a pull request.
@@ -38,7 +39,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.25/plyr.js` to `https://cdn.plyr.io/1.0.25/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.2.0/plyr.js` to `https://cdn.plyr.io/1.2.0/plyr.js`
 
 ### Bower
 If bower is your thang, you can grab Plyr using:
@@ -47,15 +48,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.
+If you want to use our CDN, you can use the following:
 
 ```html
-<link rel="stylesheet" href="//cdn.plyr.io/1.0.25/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/1.2.0/plyr.css">
-<script src="//cdn.plyr.io/1.0.25/plyr.js"></script>
+<script src="https://cdn.plyr.io/1.2.0/plyr.js"></script>
 ```
 
-You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.25/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.0/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. 
@@ -69,18 +77,18 @@ The SVG sprite for the controls icons is loaded in by AJAX to help with performa
 
 ```html
 <script>
-(function(d,p){
+(function(d, p){
-	var a=new XMLHttpRequest(),
+	var a = new XMLHttpRequest(),
-		b=d.body;
+		b = d.body;
-	a.open("GET",p,!0);
+	a.open("GET", p, true);
 	a.send();
-	a.onload=function(){
+	a.onload = function(){
-		var c=d.createElement("div");
+		var c = d.createElement("div");
-		c.style.display="none";
+		c.style.display = "none";
-		c.innerHTML=a.responseText;
+		c.innerHTML = a.responseText;
-		b.insertBefore(c,b.childNodes[0])
+		b.insertBefore(c, b.childNodes[0]);
 	}
-})(document,"dist/sprite.svg");
+})(document, "dist/sprite.svg");
 </script>
 ```
 More info on SVG sprites here:
@@ -92,18 +100,16 @@ and the AJAX technique here:
 The only extra markup that's needed to use plyr is a `<div>` wrapper. Replace the source, poster and captions with urls for your media.
 ```html
 <div class="player">
-	<video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
+	<video poster="https://cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
 		<!-- Video files -->
-		<source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
+		<source src="https://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="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
 		
 		<!-- Text track file -->
-		<track kind="captions" label="English captions" src="//cdn.selz.com/plyr/1.0/movie_captions_en.vtt" srclang="en" default>
+		<track kind="captions" label="English captions" src="https://cdn.selz.com/plyr/1.0/movie_captions_en.vtt" srclang="en" default>
 		
 		<!-- Fallback for browsers that don't support the <video> element -->
-		<div>
+		<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-			<a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-		</div>
 	</video>
 </div>
 ```
@@ -113,38 +119,40 @@ And the same for `<audio>`
 <div class="player">
 	<audio controls>
 		<!-- Audio files -->
-		<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
+		<source src="https://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="https://cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
 		
 		<!-- Fallback for browsers that don't support the <audio> element -->
-		<div>
+		<a href="https://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>
 	</audio>
 </div>
 ```	
 
+For YouTube, Plyr uses the standard YouTube API markup (an empty `<div>`):
+
+```html
+<div class="player">
+	<div data-video-id="L1h9xxCU20g" data-type="youtube"></div>
+</div>
+```
+
 #### Cross Origin (CORS)
 You'll notice the `crossorigin` attribute on the example `<video>` and `<audio>` elements. This is because the media is loaded from another domain. If your media is hosted on another domain, you may need to add this attribute. 
 
 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.
+Much of the behaviour of the player is configurable when initialising the library. Here's an example of a default setup:
 
 ```html
 <script src="dist/plyr.js"></script>
-<script>
+<script>plyr.setup();</script>
-plyr.setup({
-	*options*
-});
-</script>
 ```
 
 #### Options
 
-You can pass the following options to the setup method.
+You can pass the following options to the setup method using `plyr.setup({...})`.
 
 <table class="table" width="100%">
 <thead>
@@ -168,6 +176,18 @@ 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>iconPrefix</code></td>
+    <td>String</td>
+    <td><code>icon</code></td>
+    <td>Specify the id prefix for the icons used in the default controls (e.g. "icon-play" would be "icon"). This is to prevent clashes if you're using your own SVG defs file but with the default controls. Most people can ignore this option.</td>
+  </tr>
   <tr>
     <td><code>debug</code></td>
     <td>Boolean</td>
@@ -197,6 +217,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 +246,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 +254,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>
 
@@ -285,6 +317,11 @@ Here's a list of the methods supported:
     <td>Number</td>
     <td>Sets the player volume to the provided parameter. The value should be between 0 (muted) and 10 (loudest). If no parameter is provided, the default volume is used (5). Values over 10 are ignored.</td>
   </tr>
+  <tr>
+    <td><code>togglePlay()</code></td>
+    <td>Boolean</td>
+    <td>Toggles playback for the player based on either the boolean argument or it's current state.</td>
+  </tr>
   <tr>
     <td><code>toggleMute()</code></td>
     <td>&mdash;</td>
@@ -295,10 +332,20 @@ 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>Event</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>
-    <td>Determine if a player supports a certain MIME type.</td>
+    <td>Determine if a player supports a certain MIME type. This is not supported for embedded content (YouTube).</td>
   </tr>
   <tr>
     <td><code>source(...)</code></td>
@@ -315,11 +362,21 @@ 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>
   </tr>
+  <tr>
+    <td><code>destroy()</code></td>
+    <td>&mdash;</td>
+    <td>Destroys the plyr UI and any media event listeners, effectively restoring to the previous state before <code>setup()</code> was called.</td>
+  </tr>
+  <tr>
+    <td><code>restore()</code></td>
+    <td>&mdash;</td>
+    <td>Reverses the effects of the <code>destroy()</code> method, restoring the UI and listeners.</td>
+  </tr>
  </tbody>
 </table>
 
@@ -337,12 +394,33 @@ media.addEventListener("playing", function() {
 A complete list of events can be found here:
 [Media Events - W3.org](http://www.w3.org/2010/05/video/mediaevents.html)
 
+## Embeds
+
+Currently only YouTube is supported. Vimeo will be coming soon. Some HTML5 media events are triggered on the `media` property of the `plyr` object:
+- `play`
+- `pause`
+- `timeupdate`
+- `progress`
+
+Due to the way the YouTube API works, the `timeupdate` and `progress` events are triggered by polling every 200ms so the event may trigger without an actual value change. Buffering progress is `media.buffered` in the `plyr` object. It is a a number between 0 and 1 that specifies the percentage of the video that the player shows as buffered.
+
+```javascript
+document.querySelector(".player").plyr.media.addEventListener("play", function() { 
+	console.log("play");
+});
+``` 
+
+The `.source()` API method can also be used but the video id must be passed as the argument. 
+
+Currently caption control is not supported but I will work on this. 
+
 ## 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 +437,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 +458,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) with help from the awesome [contributors](https://github.com/Selz/plyr/graphs/contributors) 
 
 ## 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)
@@ -410,4 +493,4 @@ Also these links helped created Plyr:
 - [Styling the `<progress>` element - hongkiat.com](http://www.hongkiat.com/blog/html5-progress-bar/)
 
 ## Copyright and License
-[The MIT license](license.md).
+[The MIT license](license.md).