Fix for omitted kind attribute on <track> (fixes #88 )

Docs
Minor tweaks
2015-07-25 20:45:11 +10:00 · 2015-07-25 20:29:54 +10:00 · 2015-07-25 20:29:19 +10:00 · 2015-07-25 19:51:32 +10:00 · 2015-07-25 18:30:47 +10:00 · 2015-07-25 10:59:56 +10:00
29 changed files with 1462 additions and 604 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,4 +4,4 @@ node_modules
 .DS_Store
 aws.json
 docs/index.dev.html
-*.mp4
+*.mp4
--- a/bower.json
+++ b/bower.json
@ -17,7 +17,7 @@
        "dist/plyr.js",
        "dist/sprite.svg",
        "src/less/plyr.less",
-        "src/sass/plyr.sass",
+        "src/sass/plyr.scss",
        "src/js/plyr.js"
    ],
    "ignore": [
@ -30,4 +30,4 @@
        "url": "git://github.com/selz/plyr.git"
    },
    "license": "MIT"
-}
+}
--- a/bundles.json
+++ b/bundles.json
@ -17,6 +17,7 @@
        "js": {
            "docs.js": [
                "docs/src/js/lib/hogan-3.0.2.mustache.js",
+                "docs/src/js/lib/classlist.js",
                "docs/dist/templates.js",
                "docs/src/js/docs.js"
            ]
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,23 @@
 # Changelog

+## v1.2.4
+- Fix for omitted kind attribute on <track> (fixes #88)
+
+## v1.2.3
+- Fix for YouTube on iPhone or unsupported browsers (fallback to YouTube native)
+- Docs tidy up
+- Fullscreen for Safari fix (Fixes #96)
+
+## v1.2.2
+- Fix for :focus keyboard vs mouse (Fixes #61)
+- Fix for caption positioning in full screen (Fixes #92)
+
+## v1.2.1
+- Tooltip bug fix
+
+## v1.2.0
+- Added YouTube support
+
 ## v1.1.13
 - Added icon prefix option for when using default controls

@ -161,4 +179,4 @@
 - Return instances of Plyr to the element

 ## v1.0.0
- Initial release
+- Initial release
--- a/dist/plyr.css
+++ b/dist/plyr.css
--- a/dist/plyr.js
+++ b/dist/plyr.js
--- a/docs/dist/docs.css
+++ b/docs/dist/docs.css
--- a/docs/dist/docs.js
+++ b/docs/dist/docs.js
--- a/docs/error.html
+++ b/docs/error.html
@ -6,7 +6,7 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">

        <!-- Docs styles -->
-        <link rel="stylesheet" href="//cdn.plyr.io/1.1.14/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.2.4/docs.css">
    </head>
    <body>
        <main>
--- a/docs/index.html
+++ b/docs/index.html
@ -8,67 +8,76 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">

        <!-- Styles -->
-        <link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/plyr.css?1">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/plyr.css?1">

        <!-- Docs styles -->
-        <link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/docs.css?2">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/docs.css?1">
    </head>
    <body>
        <header>
            <h1>Plyr</h1>
            <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>
-            <ul class="actions">
-                <li>
-                    <a href="https://github.com/selz/plyr" target="_blank" class="btn btn-download">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 btn-twitter js-popup" data-window-height="250" data-window-width="500">Tweet</a>
-                    <span class="btn-count js-tweet-count">&hellip;</span>
-                </li>
-            </ul>
+            <nav>
+                <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>
-            <section class="example-video">
-                <div class="player">
-                    <video poster="https://cdn.plyr.io/static/poster.jpg" controls crossorigin>
-                        <!-- Video files -->
-                        <source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
-                        <source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
-                        
-                        <!-- Text track file -->
-                        <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/en.vtt" default>
-                        
-                        <!-- 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="example-audio">
-                <div class="player">
-                    <audio controls>
-                        <!-- Audio files -->
-                        <source src="https://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.ogg" type="audio/ogg">
-                        
-                        <!-- Fallback for browsers that don't support the <audio> element -->
-                        <a href="https://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>
+        <main role="main" id="main">
+            <nav class="btn-bar nav-panel">
+                <ul>
+                    <li><a href="#video" class="btn active btn-small">Video</a></li>
+                    <li><a href="#youtube" class="btn btn-small">YouTube</a></li>
+                    <li><a href="#audio" class="btn btn-small">Audio</a></li>
+                </ul>
+            </nav>
+            <div class="panels">
+                <section class="panel example-video active" id="video">
+                    <div class="player">
+                        <video poster="https://cdn.plyr.io/static/poster.jpg" controls crossorigin>
+                            <!-- Video files -->
+                            <source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
+                            <source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
+                            
+                            <!-- Text track file -->
+                            <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/en.vtt" default>
+                            
+                            <!-- 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>

-        <footer>
-            <p>Used by &hellip;</p>
-            <a href="https://selz.com" target="_blank" class="logo">
-                <img src="https://d33i624pw6jj68.cloudfront.net/static/img/logos/selz.svg" alt="Selz">
-            </a>
-        </footer>
-
        <!-- Load SVG defs -->
        <!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
        <script>
@ -83,18 +92,18 @@
                a.send();
                a.onload = function(){
                    var c = d.createElement("div");
-                    c.style.display="none";
+                    c.setAttribute("hidden", "");
                    c.innerHTML = a.responseText;
                    b.insertBefore(c, b.childNodes[0]);
                }
            }
-        })(document, "https://cdn.plyr.io/1.1.14/sprite.svg");
+        })(document, "https://cdn.plyr.io/1.2.4/sprite.svg");
        </script>

        <!-- Plyr core script -->
-        <script src="https://cdn.plyr.io/1.1.14/plyr.js?1"></script>
+        <script src="https://cdn.plyr.io/1.2.4/plyr.js?1"></script>

        <!-- Docs script -->
-        <script src="https://cdn.plyr.io/1.1.14/docs.js?1"></script>
+        <script src="https://cdn.plyr.io/1.2.4/docs.js?1"></script>
    </body>
 </html>
--- a/docs/src/js/docs.js
+++ b/docs/src/js/docs.js
@ -10,10 +10,15 @@ plyr.setup({
 	volume: 9,
 	title: 	"Video demo",
 	html: 	templates.controls.render({}),
+	tooltips: true,
 	captions: {
 		defaultActive: true
 	},
 	onSetup: function() {
+		if(!("media" in this)) {
+			return;
+		}
+
 		var player 	= this,
 			type 	= player.media.tagName.toLowerCase(),
 			toggle 	= document.querySelector("[data-toggle='fullscreen']");
@ -26,116 +31,145 @@ plyr.setup({
 	}
 });

-// Popup
-function popup(event) {
-	// Prevent the link opening
-	if(event.target.nodeName.toLowerCase() == "a") {
-		if(event.preventDefault) { 
-			event.preventDefault();
+// 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 {
-			event.returnValue = false;
+			// 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();
 		}
 	}

-	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";
+	// Trigger popups
+	document.querySelector(".js-popup").addEventListener("click", popup);

-	// If window exists, just focus it
-	if(window["window-"+name] && !window["window-"+name].closed) {
-		window["window-"+name].focus();
+	// 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 "&#9733; " + 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 {
-		// Get position
-		var left = window.screenLeft !== undefined ? window.screenLeft : screen.left;
-		var top = window.screenTop !== undefined ? window.screenTop : screen.top;
+		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));

-		// 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();
+				// Store in session storage
+				window.sessionStorage.github_stargazers = json.data.stargazers_count;
+			}
+		});
 	}
-}

-// Trigger popups
-document.querySelector(".js-popup").addEventListener("click", popup);
+	// 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);

-// Get JSONP
-function getJSONP(url, callback) {
-    var name = "jsonp_callback_" + Math.round(100000 * Math.random());
+				// Store in session storage
+				window.sessionStorage.tweets = json.count;
+			}
+		});
+	}

-    // Cleanup to prevent memory leaks and hit original callback
-    window[name] = function(data) {
-        delete window[name];
-        document.body.removeChild(script);
-        callback(data);
-    };
+	// Tabs
+	var tabs = document.querySelectorAll(".nav-panel a"),
+		panels = document.querySelectorAll(".panels > .panel"),
+		activeClass = "active";

-    // Create a faux script
-    var script = document.createElement("script");
-    script.setAttribute("src", url + (url.indexOf("?") >= 0 ? "&" : "?") + "callback=" + name);
+	for (var i = tabs.length - 1; i >= 0; i--) {
+		tabs[i].addEventListener("click", togglePanel);
+	}

-    // Inject to the body
-    document.body.appendChild(script);
-}
+	function togglePanel(event) {
+		event.preventDefault();

-// Get star count
-var storageSupported = ("sessionStorage" in window),
-	selectors = {
-		github: 	".js-stargazers-count",
-		twitter: 	".js-tweet-count"
-	};
+		var tab = event.target,
+			panel = document.querySelector(tab.getAttribute("href"));

-// 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;
+		for (var i = panels.length - 1; i >= 0; i--) {
+			panels[i].classList.remove(activeClass);
 		}
-	});
-}

-// 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;
+		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
--- a/docs/src/js/lib/classlist.js
+++ b/docs/src/js/lib/classlist.js
@ -0,0 +1,237 @@
+/*
+ * classList.js: Cross-browser full element.classList implementation.
+ * 1.1.20150312
+ *
+ * By Eli Grey, http://eligrey.com
+ * License: Dedicated to the public domain.
+ *   See https://github.com/eligrey/classList.js/blob/master/LICENSE.md
+ */
+
+/*global self, document, DOMException */
+
+/*! @source http://purl.eligrey.com/github/classList.js/blob/master/classList.js */
+
+if ("document" in self) {
+
+// Full polyfill for browsers with no classList support
+if (!("classList" in document.createElement("_"))) {
+
+(function (view) {
+
+"use strict";
+
+if (!('Element' in view)) return;
+
+var
+	  classListProp = "classList"
+	, protoProp = "prototype"
+	, elemCtrProto = view.Element[protoProp]
+	, objCtr = Object
+	, strTrim = String[protoProp].trim || function () {
+		return this.replace(/^\s+|\s+$/g, "");
+	}
+	, arrIndexOf = Array[protoProp].indexOf || function (item) {
+		var
+			  i = 0
+			, len = this.length
+		;
+		for (; i < len; i++) {
+			if (i in this && this[i] === item) {
+				return i;
+			}
+		}
+		return -1;
+	}
+	// Vendors: please allow content code to instantiate DOMExceptions
+	, DOMEx = function (type, message) {
+		this.name = type;
+		this.code = DOMException[type];
+		this.message = message;
+	}
+	, checkTokenAndGetIndex = function (classList, token) {
+		if (token === "") {
+			throw new DOMEx(
+				  "SYNTAX_ERR"
+				, "An invalid or illegal string was specified"
+			);
+		}
+		if (/\s/.test(token)) {
+			throw new DOMEx(
+				  "INVALID_CHARACTER_ERR"
+				, "String contains an invalid character"
+			);
+		}
+		return arrIndexOf.call(classList, token);
+	}
+	, ClassList = function (elem) {
+		var
+			  trimmedClasses = strTrim.call(elem.getAttribute("class") || "")
+			, classes = trimmedClasses ? trimmedClasses.split(/\s+/) : []
+			, i = 0
+			, len = classes.length
+		;
+		for (; i < len; i++) {
+			this.push(classes[i]);
+		}
+		this._updateClassName = function () {
+			elem.setAttribute("class", this.toString());
+		};
+	}
+	, classListProto = ClassList[protoProp] = []
+	, classListGetter = function () {
+		return new ClassList(this);
+	}
+;
+// Most DOMException implementations don't allow calling DOMException's toString()
+// on non-DOMExceptions. Error's toString() is sufficient here.
+DOMEx[protoProp] = Error[protoProp];
+classListProto.item = function (i) {
+	return this[i] || null;
+};
+classListProto.contains = function (token) {
+	token += "";
+	return checkTokenAndGetIndex(this, token) !== -1;
+};
+classListProto.add = function () {
+	var
+		  tokens = arguments
+		, i = 0
+		, l = tokens.length
+		, token
+		, updated = false
+	;
+	do {
+		token = tokens[i] + "";
+		if (checkTokenAndGetIndex(this, token) === -1) {
+			this.push(token);
+			updated = true;
+		}
+	}
+	while (++i < l);
+
+	if (updated) {
+		this._updateClassName();
+	}
+};
+classListProto.remove = function () {
+	var
+		  tokens = arguments
+		, i = 0
+		, l = tokens.length
+		, token
+		, updated = false
+		, index
+	;
+	do {
+		token = tokens[i] + "";
+		index = checkTokenAndGetIndex(this, token);
+		while (index !== -1) {
+			this.splice(index, 1);
+			updated = true;
+			index = checkTokenAndGetIndex(this, token);
+		}
+	}
+	while (++i < l);
+
+	if (updated) {
+		this._updateClassName();
+	}
+};
+classListProto.toggle = function (token, force) {
+	token += "";
+
+	var
+		  result = this.contains(token)
+		, method = result ?
+			force !== true && "remove"
+		:
+			force !== false && "add"
+	;
+
+	if (method) {
+		this[method](token);
+	}
+
+	if (force === true || force === false) {
+		return force;
+	} else {
+		return !result;
+	}
+};
+classListProto.toString = function () {
+	return this.join(" ");
+};
+
+if (objCtr.defineProperty) {
+	var classListPropDesc = {
+		  get: classListGetter
+		, enumerable: true
+		, configurable: true
+	};
+	try {
+		objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc);
+	} catch (ex) { // IE 8 doesn't support enumerable:true
+		if (ex.number === -0x7FF5EC54) {
+			classListPropDesc.enumerable = false;
+			objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc);
+		}
+	}
+} else if (objCtr[protoProp].__defineGetter__) {
+	elemCtrProto.__defineGetter__(classListProp, classListGetter);
+}
+
+}(self));
+
+} else {
+// There is full or partial native classList support, so just check if we need
+// to normalize the add/remove and toggle APIs.
+
+(function () {
+	"use strict";
+
+	var testElement = document.createElement("_");
+
+	testElement.classList.add("c1", "c2");
+
+	// Polyfill for IE 10/11 and Firefox <26, where classList.add and
+	// classList.remove exist but support only one argument at a time.
+	if (!testElement.classList.contains("c2")) {
+		var createMethod = function(method) {
+			var original = DOMTokenList.prototype[method];
+
+			DOMTokenList.prototype[method] = function(token) {
+				var i, len = arguments.length;
+
+				for (i = 0; i < len; i++) {
+					token = arguments[i];
+					original.call(this, token);
+				}
+			};
+		};
+		createMethod('add');
+		createMethod('remove');
+	}
+
+	testElement.classList.toggle("c3", false);
+
+	// Polyfill for IE 10 and Firefox <24, where classList.toggle does not
+	// support the second argument.
+	if (testElement.classList.contains("c3")) {
+		var _toggle = DOMTokenList.prototype.toggle;
+
+		DOMTokenList.prototype.toggle = function(token, force) {
+			if (1 in arguments && !this.contains(token) === !force) {
+				return force;
+			} else {
+				return _toggle.call(this, token);
+			}
+		};
+
+	}
+
+	testElement = null;
+}());
+
+}
+
+}
--- a/docs/src/less/components/base.less
+++ b/docs/src/less/components/base.less
@ -0,0 +1,52 @@
+// ==========================================================================
+// Base layout
+// ==========================================================================
+
+// BORDER-BOX ALL THE THINGS! 
+// http://paulirish.com/2012/box-sizing-border-box-ftw/
+*, *::after, *::before {  
+    box-sizing: border-box; 
+}
+
+// Hidden
+[hidden] {
+    display: none;
+}
+
+// Base
+html {
+    height: 100%;
+    font-size: 100%;
+    background: linear-gradient(#fff, @body-background) fixed;
+}
+body {
+    font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    line-height: 1.5;
+    text-align: center;
+    color: @gray;
+    .font-smoothing(on);
+    padding: 0 (@padding-base / 2);
+}
+
+// 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);
+    }
+}
--- a/docs/src/less/components/buttons.less
+++ b/docs/src/less/components/buttons.less
@ -0,0 +1,146 @@
+// ==========================================================================
+// 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;
+	white-space: nowrap;
+
+	&::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-image: linear-gradient(@link-color, darken(@link-color, 3%));
+	background-color: @link-color;
+	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: #fff;
+	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%);
+	}
+}
--- a/docs/src/less/components/error.less
+++ b/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;
+}
--- a/docs/src/less/components/examples.less
+++ b/docs/src/less/components/examples.less
@ -0,0 +1,61 @@
+// ==========================================================================
+// 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;
+    }
+}
+// Base styles
+.example-video .player {
+    max-width: @example-width-video;
+
+    video,
+    iframe {
+        border-radius: @border-radius-base;
+    }
+    iframe {
+        -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
+    }
+}
+
+// Style full supported player
+.example-video .player-video,
+.example-video .player-youtube {
+    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;
+
+        .player-controls,
+        video,
+        iframe {
+            border-radius: 0;
+        }
+        iframe {
+            -webkit-mask-image: none;
+        }
+    }
+}
--- a/docs/src/less/components/panels.less
+++ b/docs/src/less/components/panels.less
@ -0,0 +1,13 @@
+// ==========================================================================
+// Panels
+// ==========================================================================
+
+// Panels
+.panel {
+    display: none;
+
+    &.active {
+        display: block;
+        animation: fade-in .3s ease;
+    }
+}
--- a/docs/src/less/components/type.less
+++ b/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;
+    }
+}
--- a/docs/src/less/docs.less
+++ b/docs/src/less/docs.less
@ -2,233 +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
-// ---------------------------------------
-// Colors
-@blue:                      #3498db;
-@gray-dark:                 #343f4a;
-@gray:                      #565d64;
-@gray-light:                #cbd0d3;
-@off-white:                 #f2f5f7;
+@import "variables.less";

-// Elements
-@link-color:                @blue;
-@padding-base:              20px;
-@arrow-size:                8px;
+// Animation
+@import "lib/animation.less";

-// Breakpoints
-@screen-md:                 768px;
-
-// 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: @off-white;
-    line-height: 1.5;
-    text-align: center;
-    color: @gray;
-}
-
-// 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;
-}
+// Base layout
+@import "components/base.less";

 // Type
-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;
-}
-p,
-small {
-    margin: 0 0 @padding-base;
-}
-small {
-    display: block;
-    padding: 0 (@padding-base / 2);
-    .font-size(14);
-}
+@import "lib/fontface.less";
+@import "components/type.less";

-// Header
-header {
-    padding: @padding-base;
-    margin-bottom: @padding-base;
+// Buttons
+@import "components/buttons.less";

-    p {
-        .font-size(18);
-    }
-    @media (min-width: 560px) {
-        padding-top: (@padding-base * 3);
-        padding-bottom: (@padding-base * 3);
-    }
-}
+// Panels
+@import "components/panels.less";

-// Sections
-section {
-    padding-bottom: @padding-base;
+// Error
+@import "components/error.less";

-    @media (min-width: 560px) {
-        padding-bottom: (@padding-base * 2);
-    }
-}
-
-// Links & Buttons
-.actions {
-    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;
-    }
-}
-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,
-.btn-count {
-    display: inline-block;
-    vertical-align: middle;
-    border-radius: 3px;
-    .font-smoothing(on);
-    font-weight: 600;
-    user-select: none;
-}
-.btn {
-    padding: (@padding-base / 2) @padding-base;
-    background: @link-color;
-    border: 0;
-    color: #fff;
-    
-    &:hover,
-    &:focus {
-        color: #fff;
-        background: darken(@link-color, 5%);
-    }
-
-    &-twitter {
-        background: #8799A2;
-
-        &:hover,
-        &:focus {
-            background: darken(#8799A2, 5%);
-        }
-    }
-}
-.btn-count {
-    position: relative;
-    margin-left: 6px;
-    padding: ((@padding-base / 2) - 1px);
-    background: #fff;
-    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%);
-    }
-}
-
-// Example players
-.example-audio .player,
-.example-video .player {
-    margin: 0 auto @padding-base;
-
-    &-controls {
-        border-radius: 0 0 4px 4px;
-    }
-}
-.example-audio .player {
-    max-width: 520px;
-
-    &-controls {
-        border-radius: 4px;
-    }
-    &-progress {
-        border-radius: 4px 4px 0 0;
-        overflow: hidden;
-    }
-}
-.example-video .player {
-    max-width: 1200px;
-
-    video {
-        border-radius: 4px 4px 0 0;
-    }
-    &-fullscreen,
-    &.fullscreen-active {
-        max-width: none;
-    }
-}
-
-
-// Footer
-footer {
-    margin-bottom: @padding-base;
-
-    p {
-        margin-bottom: (@padding-base / 2);
-    }
-}
+// Examples
+@import "components/examples.less";
--- a/docs/src/less/lib/animation.less
+++ b/docs/src/less/lib/animation.less
@ -0,0 +1,9 @@
+// ==========================================================================
+// Animations
+// ==========================================================================
+
+// Fade
+@keyframes fade-in {
+	0% 		{ opacity: 0 }
+	100% 	{ opacity: 1 }
+}
--- a/docs/src/less/lib/fontface.less
+++ b/docs/src/less/lib/fontface.less
@ -1,16 +1,18 @@
+// ==========================================================================
+// Fonts
+// ==========================================================================
+
@font-face {
    font-family: "Avenir";
    src:    url("//cdn.plyr.io/fonts/avenir-medium.woff2") format("woff2"), 
-            url("//cdn.plyr.io/fonts/avenir-medium.woff") format("woff"), 
-            url("//cdn.plyr.io/fonts/avenir-medium.ttf")  format("truetype");
+            url("//cdn.plyr.io/fonts/avenir-medium.woff") format("woff");
    font-style:   normal;
    font-weight:  400;
 }
@font-face {
    font-family: "Avenir";
    src:    url("//cdn.plyr.io/fonts/avenir-bold.woff2") format("woff2"), 
-            url("//cdn.plyr.io/fonts/avenir-bold.woff") format("woff"), 
-            url("//cdn.plyr.io/fonts/avenir-bold.ttf")  format("truetype");
+            url("//cdn.plyr.io/fonts/avenir-bold.woff") format("woff");
    font-style:   normal;
    font-weight:  600;
 }
--- a/docs/src/less/lib/mixins.less
+++ b/docs/src/less/lib/mixins.less
@ -17,7 +17,6 @@
    // Default
    outline: thin dotted @gray-dark;
    // Webkit
-    //outline: 5px auto -webkit-focus-ring-color;
    outline-offset: 1px;
 }

@ -25,7 +24,7 @@
 // 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: ~"@{rem}rem";
 }
--- a/docs/src/less/variables.less
+++ b/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;
--- a/gulpfile.js
+++ b/gulpfile.js
@ -167,7 +167,7 @@ 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", "watch");
 });

 // Build all JS (inc. templates)
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "plyr",
-  "version": "1.1.14",
+  "version": "1.2.4",
  "description": "A simple HTML5 media player using custom controls",
  "homepage": "http://plyr.io",
  "main": "gulpfile.js",
--- a/readme.md
+++ b/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?2)](http://plyr.io)
+[![Image of Plyr](https://cdn.plyr.io/static/plyr.jpg)](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. 
+We wanted a lightweight, accessible and customisable media player that just supports [*modern*](#browser-support) 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 6.4KB minified and gzipped.
- **Customisable** - make the player look how you want with the markup you want.
+- **Lightweight** - just 7.5KB minified and gzipped.
+- **[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.
- **Fullscreen** - supports native fullscreen with fallback to "full window" modes.
+- **[Embedded Video](#embeds)** - support for YouTube (Vimeo soon).
+- **[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,10 +26,11 @@ Oh and yes, it works with Bootstrap.
 Check out [the changelog](changelog.md)

 ## Planned development
- Playlists (audio and video)
- YouTube and Vimeo support
+- Playlists
+- ~~YouTube~~ and Vimeo support
 - Playback speed
 - Multiple language captions (with selection)
+- Audio captions
 ... 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.
@ -37,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.1.14/plyr.js` to `https://cdn.plyr.io/1.1.14/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.4/plyr.js` to `https://cdn.plyr.io/1.2.4/plyr.js`

 ### Bower
 If bower is your thang, you can grab Plyr using:
@ -57,11 +59,11 @@ More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub]
 If you want to use our CDN, you can use the following:

 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/plyr.css">
-<script src="https://cdn.plyr.io/1.1.14/plyr.js"></script>
+<link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/plyr.css">
+<script src="https://cdn.plyr.io/1.2.4/plyr.js"></script>
 ```

-You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.14/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.4/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. 
@ -75,18 +77,18 @@ The SVG sprite for the controls icons is loaded in by AJAX to help with performa

 ```html
 <script>
-(function(d,p){
-	var a=new XMLHttpRequest(),
-		b=d.body;
-	a.open("GET",p,!0);
+(function(d, p){
+	var a = new XMLHttpRequest(),
+		b = d.body;
+	a.open("GET", p, true);
 	a.send();
-	a.onload=function(){
-		var c=d.createElement("div");
-		c.style.display="none";
-		c.innerHTML=a.responseText;
-		b.insertBefore(c,b.childNodes[0])
+	a.onload = function(){
+		var c = d.createElement("div");
+		c.style.display = "none";
+		c.innerHTML = a.responseText;
+		b.insertBefore(c, b.childNodes[0]);
 	}
-})(document,"dist/sprite.svg");
+})(document, "dist/sprite.svg");
 </script>
 ```
 More info on SVG sprites here:
@ -126,6 +128,14 @@ And the same for `<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. 

@ -335,7 +345,7 @@ Here's a list of the methods supported:
  <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>
@ -350,6 +360,9 @@ Here's a list of the methods supported:
      <strong>array</strong><br>
      <code>.source([{ src: "/path/to/video.webm", type: "video/webm", ...more attributes... }, { src: "/path/to/video.mp4", type: "video/mp4", ...more attributes... }])`</code><br>
      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. 
+      <br><br>
+      <strong>YouTube</strong><br>
+      Currently this API method only accepts a YouTube ID when used with a YouTube player. I will add URL support soon, along with being able to swap between types (e.g. YouTube to Audio or Video and vice versa.)
    </td>
  </tr>
  <tr>
@ -384,6 +397,26 @@ 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.
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.1.14
+// plyr.js v1.2.4
 // https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@ -9,6 +9,7 @@

 (function (api) {
    "use strict";
+    /*global YT*/

    // Globals
    var fullscreen, config;
@ -49,16 +50,16 @@
            duration:           ".player-duration"
        },
        classes: {
-            video:              "player-video",
            videoWrapper:       "player-video-wrapper",
-            audio:              "player-audio",
+            embedWrapper:       "player-video-embed",
+            type:               "player-{0}",
            stopped:            "stopped",
            playing:            "playing",
            muted:              "muted",
            loading:            "loading",
            tooltip:            "player-tooltip",
            hidden:             "sr-only",
-            hover:              "hover",
+            hover:              "player-hover",
            captions: {
                enabled:        "captions-enabled",
                active:         "captions-active"
@ -82,7 +83,7 @@
            key:                "plyr_volume"
        },
        controls:               ["restart", "rewind", "play", "fast-forward", "current-time", "duration", "mute", "volume", "captions", "fullscreen"],
-        onSetup:                function() {}, 
+        onSetup:                function() {}
    };

    // Build the default HTML
@ -331,6 +332,18 @@
        return false;
    }

+    // Inject a script
+    function _injectScript(source) {
+        if(document.querySelectorAll("script[src='" + source + "']").length) {
+            return;
+        }
+
+        var tag = document.createElement("script");
+        tag.src = source;
+        var firstScriptTag = document.getElementsByTagName("script")[0];
+        firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
+    }
+
    // Element exists in an array
    function _inArray(haystack, needle) {
        return Array.prototype.indexOf && (haystack.indexOf(needle) != -1);
@ -516,12 +529,12 @@
            },
            browserPrefixes = "webkit moz o ms khtml".split(" ");

-        // check for native support
+        // Check for native support
        if (typeof document.cancelFullScreen != "undefined") {
            fullscreen.supportsFullScreen = true;
        }
        else {
-            // check for fullscreen support by vendor prefix
+            // Check for fullscreen support by vendor prefix
            for (var i = 0, il = browserPrefixes.length; i < il; i++ ) {
                fullscreen.prefix = browserPrefixes[i];

@ -538,12 +551,6 @@
            }
        }

-        // Safari doesn't support the ALLOW_KEYBOARD_INPUT flag (for security) so set it to not supported
-        // https://bugs.webkit.org/show_bug.cgi?id=121496
-        if(fullscreen.prefix === "webkit" && !!navigator.userAgent.match(/Version\/[\d\.]+.*Safari/)) {
-             fullscreen.supportsFullScreen = false;
-        }
-
        // Update methods to do something useful
        if (fullscreen.supportsFullScreen) {
            // Yet again Microsoft awesomeness, 
@ -552,9 +559,8 @@

            fullscreen.isFullScreen = function(element) {
                if(typeof element == "undefined") {
-                    element = document;
+                    element = document.body;
                }
-
                switch (this.prefix) {
                    case "":
                        return document.fullscreenElement == element;
@ -565,7 +571,10 @@
                }
            };
            fullscreen.requestFullScreen = function(element) {
-                return (this.prefix === "") ? element.requestFullScreen() : element[this.prefix + (this.prefix == "ms" ? "RequestFullscreen" : "RequestFullScreen")](this.prefix === "webkit" ? element.ALLOW_KEYBOARD_INPUT : null);
+                if(typeof element == "undefined") {
+                    element = document.body;
+                }
+                return (this.prefix === "") ? element.requestFullScreen() : element[this.prefix + (this.prefix == "ms" ? "RequestFullscreen" : "RequestFullScreen")]();
            };
            fullscreen.cancelFullScreen = function() {
                return (this.prefix === "") ? document.cancelFullScreen() : document[this.prefix + (this.prefix == "ms" ? "ExitFullscreen" : "CancelFullScreen")]();
@ -817,7 +826,7 @@
                player.media.removeAttribute("controls");
        
                // Add type class
-                _toggleClass(player.container, config.classes[player.type], true);
+                _toggleClass(player.container, config.classes.type.replace("{0}", player.type), true);

                // 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));
@ -841,12 +850,162 @@
                }
            }

+            // YouTube
+            if(player.type == "youtube") {
+                _setupYouTube(player.media.getAttribute("data-video-id"));
+            }
+
            // Autoplay
            if(player.media.getAttribute("autoplay") !== null) {
                _play();
            }
        }

+        // Setup YouTube
+        function _setupYouTube(id) {
+            // Remove old containers
+            var containers = _getElements("[id^='youtube']");
+            for (var i = containers.length - 1; i >= 0; i--) {
+                _remove(containers[i]);
+            }
+
+            // Create the YouTube container
+            var container = document.createElement("div");
+            container.setAttribute("id", "youtube-" + Math.floor(Math.random() * (10000)));
+            player.media.appendChild(container);
+
+            // Add embed class for responsive
+            _toggleClass(player.media, config.classes.videoWrapper, true);
+            _toggleClass(player.media, config.classes.embedWrapper, true);
+
+            if(typeof YT === "object") {
+                _YTReady(id, container);
+            }
+            else {
+                // Load the API
+                _injectScript("https://www.youtube.com/iframe_api");
+
+                // Setup callback for the API
+                window.onYouTubeIframeAPIReady = function () { _YTReady(id, container); }
+            }
+        }
+
+        // Handle API ready
+        function _YTReady(id, container) {
+            _log("YouTube API Ready");
+
+            // Setup timers object
+            // We have to poll YouTube for updates
+            if(!("timer" in player)) {
+                player.timer = {};
+            }
+
+            // Setup instance
+            // https://developers.google.com/youtube/iframe_api_reference
+            player.embed = new YT.Player(container.id, {
+                videoId: id,
+                playerVars: {
+                    autoplay: 0,
+                    controls: (player.supported.full ? 0 : 1),
+                    vq: "hd720",
+                    rel: 0,
+                    showinfo: 0,
+                    iv_load_policy: 3,
+                    cc_lang_pref: "en",
+                    wmode: "transparent",
+                    modestbranding: 1
+                },
+                events: {
+                    onReady: function(event) {
+                        // Get the instance
+                        var instance = event.target;
+
+                        // Create a faux HTML5 API using the YouTube API
+                        player.media.play = function() { instance.playVideo(); };
+                        player.media.pause = function() { instance.pauseVideo(); };
+                        player.media.stop = function() { instance.stopVideo(); };
+                        player.media.duration = instance.getDuration();
+                        player.media.paused = (instance.getPlayerState() == 2);
+                        player.media.currentTime = instance.getCurrentTime();
+                        player.media.muted = instance.isMuted();
+
+                        // Trigger timeupdate
+                        _triggerEvent(player.media, "timeupdate");
+
+                        // Reset timer
+                        window.clearInterval(player.timer.buffering);
+
+                        // Setup buffering
+                        player.timer.buffering = window.setInterval(function() { 
+                            // Get loaded % from YouTube
+                            player.media.buffered = instance.getVideoLoadedFraction();
+                            
+                            // Trigger progress
+                            _triggerEvent(player.media, "progress");
+
+                            // Bail if we're at 100%
+                            if(player.media.buffered === 1) {
+                                window.clearInterval(player.timer.buffering);
+                            }
+                        }, 200);
+
+                        if(player.supported.full) {
+                            // Only setup controls once
+                            if(!player.container.querySelectorAll(config.selectors.controls).length) {
+                                _setupInterface();
+                            }
+
+                            // Display duration if available
+                            if(config.displayDuration) {
+                                _displayDuration();
+                            }
+                        }
+                    },
+                    onStateChange: function(event) {
+                        // Get the instance
+                        var instance = event.target;
+
+                        // Reset timer
+                        window.clearInterval(player.timer.playing);
+
+                        // Handle events
+                        // -1   Unstarted
+                        // 0    Ended
+                        // 1    Playing
+                        // 2    Paused
+                        // 3    Buffering
+                        // 5    Video cued    
+                        switch(event.data) {
+                            case 0: 
+                                player.media.paused = true;
+                                _triggerEvent(player.media, "ended");
+                                break;
+
+                            case 1:
+                                player.media.paused = false;
+                                _triggerEvent(player.media, "play");
+
+                                // Poll to get playback progress
+                                player.timer.playing = window.setInterval(function() {
+                                    // Set the current time
+                                    player.media.currentTime = instance.getCurrentTime();
+
+                                    // Trigger timeupdate
+                                    _triggerEvent(player.media, "timeupdate");
+                                }, 200);
+
+                                break;
+
+                            case 2:
+                                player.media.paused = true;
+                                _triggerEvent(player.media, "pause");
+                                break;
+                        }
+                    }
+                }
+            });
+        }
+
        // Setup captions
        function _setupCaptions() {
            if(player.type === "video") {
@ -869,8 +1028,8 @@

                for (var i = 0; i < children.length; i++) {
                    if (children[i].nodeName.toLowerCase() === "track") {
-                        kind = children[i].getAttribute("kind");
-                        if (kind === "captions") {
+                        kind = children[i].kind;
+                        if (kind === "captions" || kind === "subtitles") {
                            captionSrc = children[i].getAttribute("src");
                        }
                    }
@ -922,7 +1081,7 @@
                        for (var y=0; y < tracks.length; y++) {
                            var track = tracks[y];

-                            if (track.kind === "captions") {
+                            if (track.kind === "captions" || track.kind === "subtitles") {
                                _on(track, "cuechange", function() {
                                    // Clear container
                                    player.captionsContainer.innerHTML = "";
@ -997,7 +1156,7 @@

        // Setup fullscreen
        function _setupFullscreen() {
-            if(player.type === "video" && config.fullscreen.enabled) {
+            if(player.type != "audio" && config.fullscreen.enabled) {
                // Check for native support
                var nativeSupport = fullscreen.supportsFullScreen;

@ -1093,6 +1252,14 @@
            }
            catch(e) {}

+            // YouTube
+            if(player.type == "youtube") {
+                player.embed.seekTo(player.media.currentTime);
+
+                // Trigger timeupdate
+                _triggerEvent(player.media, "timeupdate");
+            }
+
            // Logging
            _log("Seeking to " + player.media.currentTime + " seconds");

@ -1153,7 +1320,7 @@
            // Show the player controls
            function _showControls() {
                // Set shown class
-                _toggleClass(player.controls, config.classes.hover, true);
+                _toggleClass(player.container, config.classes.hover, true);

                // Clear timer every movement
                window.clearTimeout(hoverTimer);
@ -1161,7 +1328,7 @@
                // If the mouse is not over the controls, set a timeout to hide them
                if(!isMouseOver) {
                    hoverTimer = window.setTimeout(function() {
-                        _toggleClass(player.controls, config.classes.hover, false);
+                        _toggleClass(player.container, config.classes.hover, false);
                    }, 2000);
                }
            }
@ -1215,6 +1382,14 @@
            // Set the player volume
            player.media.volume = parseFloat(volume / 10);

+            // YouTube
+            if(player.type == "youtube") {
+                player.embed.setVolume(player.media.volume * 100);
+
+                // Trigger timeupdate
+                _triggerEvent(player.media, "volumechange");
+            }
+
            // Toggle muted state
            if(player.media.muted && volume > 0) {
                _toggleMute();
@ -1230,6 +1405,14 @@

            // Set mute on the player
            player.media.muted = muted;
+
+            // YouTube
+            if(player.type === "youtube") {
+                player.embed[player.media.muted ? "mute" : "unMute"]();
+
+                // Trigger timeupdate
+                _triggerEvent(player.media, "volumechange");
+            }
        }

        // Update volume UI and storage
@ -1320,9 +1503,14 @@
                        value       = (function() { 
                                        var buffered = player.media.buffered;

-                                        if(buffered.length) {
+                                        // HTML5
+                                        if(buffered && buffered.length) {
                                            return _getPercentage(buffered.end(0), player.media.duration);
                                        }
+                                        // YouTube returns between 0 and 1
+                                        else if(typeof buffered == "number") {
+                                            return (buffered * 100);
+                                        }

                                        return 0;                                   
                                    })();
@ -1416,6 +1604,22 @@
        // Update source
        // Sources are not checked for support so be careful
        function _parseSource(sources) {
+            // YouTube
+            if(player.type === "youtube" && typeof sources === "string") {
+                // Destroy YouTube instance
+                player.embed.destroy();
+
+                // Re-setup YouTube
+                // We don't use loadVideoBy[x] here since it has issues
+                _setupYouTube(sources);
+
+                // Update times
+                _timeUpdate();
+
+                // Bail
+                return;
+            }
+
            // Pause playback (webkit freaks out)
            _pause();

@ -1469,6 +1673,34 @@
            // IE doesn't support input event, so we fallback to change
            var inputEvent = (player.browser.name == "IE" ? "change" : "input");

+            // Detect tab focus
+            function checkFocus() {
+                var focused = document.activeElement;
+                if (!focused || focused == document.body) {
+                    focused = null;
+                }
+                else if (document.querySelector){
+                    focused = document.querySelector(":focus");
+                }
+                for (var button in player.buttons) {
+                    var element = player.buttons[button];
+
+                    _toggleClass(element, "tab-focus", (element === focused));
+                }
+            }
+            _on(window, "keyup", function(event) {
+                var code = (event.keyCode ? event.keyCode : event.which);
+
+                if(code == 9) { checkFocus(); }
+            });
+            for (var button in player.buttons) {
+                var element = player.buttons[button];
+
+                _on(element, "blur", function() {
+                    _toggleClass(element, "tab-focus", false);
+                });
+            }
+
            // Play
            _on(player.buttons.play, "click", function() { 
                _play(); 
@ -1537,10 +1769,7 @@
            });

            // Check for buffer progress
-            _on(player.media, "progress", _updateProgress);
-
-            // Also check on start of playing
-            _on(player.media, "playing", _updateProgress);
+            _on(player.media, "progress playing", _updateProgress);

            // Handle native mute
            _on(player.media, "volumechange", _updateVolume);
@ -1572,6 +1801,8 @@
        }

        // Destroy an instance
+        // Event listeners are removed when elements are removed
+        // http://stackoverflow.com/questions/12528049/if-a-dom-element-is-removed-are-its-listeners-also-removed-from-memory
        function _destroy() {
            // Bail if the element is not initialized
            if(!player.init) {
@ -1581,12 +1812,18 @@
            // Reset container classname
            player.container.setAttribute("class", config.selectors.container.replace(".", ""));

-            // Event listeners are removed when elements are removed
-            // http://stackoverflow.com/questions/12528049/if-a-dom-element-is-removed-are-its-listeners-also-removed-from-memory
+            // Remove init flag
+            player.init = false;

            // Remove controls
            _remove(_getElement(config.selectors.controls));

+            // YouTube
+            if(player.type === "youtube") {
+                player.embed.destroy();
+                return;
+            }
+
            // If video, we need to remove some more
            if(player.type === "video") {
                // Remove captions
@ -1603,9 +1840,6 @@
            // http://stackoverflow.com/questions/19469881/javascript-remove-all-event-listeners-of-specific-type
            var clone = player.media.cloneNode(true);
            player.media.parentNode.replaceChild(clone, player.media);
-
-            // Remove init flag
-            player.init = false;
        }

        // Setup a player
@ -1622,11 +1856,20 @@
            player.browser = _browserSniff();

            // Get the media element
-            player.media = player.container.querySelectorAll("audio, video")[0];
+            player.media = player.container.querySelectorAll("audio, video, div")[0];

            // Set media type
-            player.type = player.media.tagName.toLowerCase();
+            var tagName = player.media.tagName.toLowerCase();
+            switch(tagName) {
+                case "div":
+                    player.type = player.media.getAttribute("data-type");
+                    break;

+                default:
+                    player.type = tagName;
+                    break;
+            }
+        
            // Check for full support
            player.supported = api.supported(player.type);

@ -1641,16 +1884,16 @@
            // Setup media
            _setupMedia();

-            // If there's full support
-            if(player.supported.full) {
-                // Inject custom controls
-                _injectControls();
-
-                // Find the elements
-                if(!_findElements()) {
-                    return false;
+            // Setup interface
+            if(player.type == "video" || player.type == "audio") {
+                // Bail if no support
+                if(!player.supported.full) {
+                    return;
                }

+                // Setup UI
+                _setupInterface();
+
                // Display duration if available
                if(config.displayDuration) {
                    _displayDuration();
@ -1658,25 +1901,35 @@

                // Set up aria-label for Play button with the title option
                _setupAria();
-
-                // Captions
-                _setupCaptions();
-
-                // Set volume
-                _setVolume();
-                _updateVolume();
-
-                // Setup fullscreen
-                _setupFullscreen();
-
-                // Listeners
-                _listeners();
            }

            // Successful setup
            player.init = true;
        }

+        function _setupInterface() {
+            // Inject custom controls
+            _injectControls();
+
+            // Find the elements
+            if(!_findElements()) {
+                return false;
+            }
+
+            // Captions
+            _setupCaptions();
+
+            // Set volume
+            _setVolume();
+            _updateVolume();
+
+            // Setup fullscreen
+            _setupFullscreen();
+
+            // Listeners
+            _listeners();
+        }
+
        // Initialize instance 
        _init();

@ -1727,6 +1980,11 @@
                full  = (basic && !oldIE);
                break; 

+            case "youtube": 
+                basic = true;
+                full  = (!oldIE && !iPhone);
+                break; 
+
            default:
                basic = (audio && video);
                full  = (basic && !oldIE);
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@ -1,15 +1,18 @@
 // ==========================================================================
-// HTML5 Media Player
+// Plyr styles
+// https://github.com/selz/plyr
 // ==========================================================================

 // Variables
 // -------------------------------
+
 // Colors
@blue:                      #3498DB;
-@gray-dark:                 #343f4a;
-@gray:                      #565d64;
-@gray-light:                #cbd0d3;
-@off-white:                 #d6dadd;
+@gray-dark:                 #343F4A;
+@gray:                      #565D64;
+@gray-light:                #6B7D86;
+@gray-lighter:              #CBD0D3;
+@off-white:                 #D6DADD;

 // Font sizes
@font-size-small:           14px;
@ -18,15 +21,14 @@

 // Controls
@control-spacing:           10px;
-@controls-bg:               @gray-dark;
+@controls-bg:               #fff;
@control-bg-hover:          @blue;
-@control-color:             @gray-light;
-@control-color-inactive:    @gray;
-@control-color-hover:       #fff;
+.contrast-control-color(@controls-bg);
+.contrast-control-color-hover(@control-bg-hover);

 // Tooltips
@tooltip-bg:                @controls-bg;
-@tooltip-color:             #fff;
+@tooltip-color:             @control-color;
@tooltip-padding:           @control-spacing;   
@tooltip-arrow-size:        5px;
@tooltip-radius:            3px;
@ -40,7 +42,7 @@

 // Volume
@volume-track-height:       6px;
-@volume-track-bg:           @gray;
+@volume-track-bg:           darken(@controls-bg, 10%);
@volume-thumb-height:       (@volume-track-height * 2);
@volume-thumb-width:        (@volume-track-height * 2);
@volume-thumb-bg:           @control-color;
@ -50,18 +52,40 @@
@bp-control-split:          560px; // When controls split into left/right
@bp-captions-large:         768px; // When captions jump to the larger font size

-// Utility classes & mixins
-// -------------------------------
-// Screen reader only
-.sr-only {
-    position: absolute !important;
-    clip: rect(1px, 1px, 1px, 1px);
-    padding: 0 !important;
-    border: 0 !important;
-    height: 1px !important;
-    width: 1px !important;
-    overflow: hidden;
+// Animation
+// ---------------------------------------
+
+@keyframes progress {
+    to { background-position: @progress-loading-size 0; }
 }
+
+// Mixins
+// -------------------------------
+
+// Contrast
+.contrast-control-color(@color: "") when (lightness(@color) >= 65%) {
+    @control-color: @gray-light;
+}
+.contrast-control-color(@color: "") when (lightness(@color) < 65%) {
+    @control-color: @gray-lighter;
+}
+.contrast-control-color-hover(@color: "") when (lightness(@color) >= 65%) {
+    @control-color-hover: @gray;
+}
+.contrast-control-color-hover(@color: "") when (lightness(@color) < 65%) {
+    @control-color-hover: #fff;
+}
+
+// Font smoothing
+.font-smoothing(@mode: on) when (@mode = on) {
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-font-smoothing: antialiased;
+}
+.font-smoothing(@mode: on) when (@mode = off) {
+    -moz-osx-font-smoothing: auto;
+    -webkit-font-smoothing: subpixel-antialiased;
+}
+
 // Contain floats: nicolasgallagher.com/micro-clearfix-hack/
 .clearfix() {
    zoom: 1;
@ -75,14 +99,7 @@
    outline-offset: 0;
 }

-// Animation
-// ---------------------------------------
-@keyframes progress {
-    to { background-position: @progress-loading-size 0; }
-}
-
 // <input type="range"> styling
-// ---------------------------------------
 .volume-thumb() {
    height: @volume-thumb-height;
    width: @volume-thumb-width;
@ -109,15 +126,16 @@
    border: 0;
 }

-// Font smoothing
-// ---------------------------------------
-.font-smoothing(@mode: on) when (@mode = on) {
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-}
-.font-smoothing(@mode: on) when (@mode = off) {
-    -moz-osx-font-smoothing: auto;
-    -webkit-font-smoothing: subpixel-antialiased;
+// Screen reader only
+// -------------------------------
+.sr-only {
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+    padding: 0 !important;
+    border: 0 !important;
+    height: 1px !important;
+    width: 1px !important;
+    overflow: hidden;
 }

 // Styles
@ -141,12 +159,28 @@
    &-video-wrapper {
        position: relative;
    }
-    video {
+    video,
+    audio {
        width: 100%;
        height: auto;
        vertical-align: middle;
    }

+    // For embeds
+    &-video-embed {
+        padding-bottom: 56.25%; /* 16:9 */
+        height: 0;
+        
+        iframe {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            border: 0;
+        }
+    }
+
    // Captions
    &-captions {
        display: none;
@ -184,6 +218,7 @@
        background: @controls-bg;
        line-height: 1;
        text-align: center;
+        box-shadow: 0 1px 1px rgba(red(@gray-dark), green(@gray-dark), blue(@gray-dark), .2);

        // Layout
        &-right {
@ -207,7 +242,7 @@
            margin: 0 2px;
            padding: (@control-spacing / 2) @control-spacing;
            
-            transition: background .3s ease;
+            transition: background .3s ease, color .3s ease, opacity .3s ease;
            border-radius: 3px;
            cursor: pointer;

@ -221,12 +256,13 @@
        }
        input + label,
        .inverted:checked + label {
-            color: @control-color-inactive;
+            opacity: .5;
        }
        button, 
        .inverted + label,
        input:checked + label {
            color: @control-color;
+            opacity: 1;
        }
        button {
            border: 0;
@ -241,6 +277,7 @@
        [type="checkbox"] + label:hover {
            background: @control-bg-hover;
            color: @control-color-hover;
+            opacity: 1;
        }
        button:focus,
        input:focus + label {
@ -273,13 +310,14 @@
            &::before {
                content: "\2044";
                margin-right: @control-spacing;
-                color: darken(@control-color, 30%);
            }
        }
    }

    // Tooltips
    &-tooltip {
+        @border-base: darken(@tooltip-bg, 8%);
+
        visibility: hidden;
        position: absolute;
        z-index: 2;
@ -289,37 +327,42 @@

        opacity: 0;
        background: @tooltip-bg;
+        border: 1px solid @border-base;
        border-radius: @tooltip-radius;
        color: @tooltip-color;
        font-size: @font-size-small;
        line-height: 1.5;
        font-weight: 600;

-        transform: translate(-50%, (@tooltip-padding * 3));
-        transition: transform .2s .2s ease, opacity .2s .2s ease;
-
+        transform: translate(-50%, (@tooltip-padding * 3)) scale(0);
+        transform-origin: 50% 100%;
+        transition: transform .2s .1s ease, opacity .2s .1s ease;
+      
+        // Arrow
        &::after {
            content: "";
-            display: block;
            position: absolute;
+            z-index: 1;
+            top: 100%;
            left: 50%;
-            bottom: -@tooltip-arrow-size;
-            margin-left: -@tooltip-arrow-size;
-            width: 0;
-            height: 0;
-            transition: inherit;
-            border-style: solid;
-            border-width: @tooltip-arrow-size @tooltip-arrow-size 0 @tooltip-arrow-size;
-            border-color: @controls-bg transparent transparent;
+            display: block;
+            width: 10px;
+            height: 10px;
+            background: @tooltip-bg;
+            transform: translate(-50%, -50%) rotate(45deg) translateY(2px);
+            
+            @arrow-border-color: darken(@border-base, 5%);
+            border: 1px solid rgba(red(@arrow-border-color), green(@arrow-border-color), blue(@arrow-border-color), .8);
+            border-width: 0 1px 1px 0;
        }
    }
    label:hover .player-tooltip,
-    input:focus + label .player-tooltip, 
+    input.tab-focus:focus + label .player-tooltip, 
    button:hover .player-tooltip,
-    button:focus .player-tooltip {
+    button.tab-focus:focus .player-tooltip {
        visibility: visible;
        opacity: 1;
-        transform: translate(-50%, 0);
+        transform: translate(-50%, 0) scale(1);
    }
    label:hover .player-tooltip,
    button:hover .player-tooltip {
@ -454,7 +497,7 @@
    // Volume control
    // <input[type='range']> element
    // Specificity is for bootstrap compatibility
-    &-volume[type=range] {
+    &-volume[type="range"] {
        display: inline-block;
        vertical-align: middle;
        -webkit-appearance: none;
@ -559,16 +602,7 @@
        .player-video-wrapper {
            height: 100%;
            width: 100%;
-
-            .player-captions {
-                top: auto;
-                bottom: 90px;
-
-                @media (min-width: @bp-control-split) {
-                    bottom: 60px;
-                }
-            }
-        }
+        }  
        .player-controls {
            position: absolute;
            bottom: 0;
@ -577,13 +611,29 @@
        }

        // Hide controls when playing in full screen
-        &.fullscreen-hide-controls.playing .player-controls {
-            transform: translateY(100%) translateY(@control-spacing / 2);
-            transition: transform .3s .2s ease;
-
-            &.hover {
+        &.fullscreen-hide-controls.playing {
+            .player-controls {
+                transform: translateY(100%) translateY(@control-spacing / 2);
+                transition: transform .3s .2s ease;
+            }
+            &.player-hover .player-controls {
                transform: translateY(0);
            }
+            .player-captions {
+                bottom: (@control-spacing / 2);
+                transition: bottom .3s .2s ease;
+            }
+        }
+
+        // Captions
+        .player-captions,
+        &.fullscreen-hide-controls.playing.player-hover .player-captions {
+            top: auto;
+            bottom: 90px;
+
+            @media (min-width: @bp-control-split) {
+                bottom: 60px;
+            }
        }
    }

--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@ -1,15 +1,18 @@
 // ==========================================================================
-// HTML5 Media Player
+// Plyr styles
+// https://github.com/selz/plyr
 // ==========================================================================

 // Variables
 // -------------------------------
+
 // Colors
 $blue:                    #3498DB !default;
-$gray-dark:               #343f4a !default;
-$gray:                    #565d64 !default;
-$gray-light:              #cbd0d3 !default;
-$off-white:               #d6dadd !default;
+$gray-dark:               #343F4A !default;
+$gray:                    #565D64 !default;
+$gray-light:              #6B7D86 !default;
+$gray-lighter:            #CBD0D3 !default;
+$off-white:               #D6DADD !default;

 // Font sizes
 $font-size-small:         14px !default;
@ -18,15 +21,14 @@ $font-size-large:         ceil(($font-size-base * 1.5)) !default;

 // Controls
 $control-spacing:         10px !default;
-$controls-bg:             $gray-dark !default;
-$control-bg-hover:        $blue !default;
-$control-color:           $gray-light !default;
-$control-color-inactive:  $gray !default;
-$control-color-hover:     #fff !default;
+$controls-bg:             #fff !default;
+$control-bg-hover:        @blue !default;
+.contrast-control-color($controls-bg);
+.contrast-control-color-hover($control-bg-hover);

 // Tooltips
 $tooltip-bg:              $controls-bg !default;
-$tooltip-color:           #fff !default;
+$tooltip-color:           $control-color !default;
 $tooltip-padding:         $control-spacing !default;
 $tooltip-arrow-size:      5px !default;
 $tooltip-radius:          3px !default;
@ -40,7 +42,7 @@ $progress-loading-bg:     rgba(0,0,0, .15) !default;

 // Volume
 $volume-track-height:     6px !default;
-$volume-track-bg:         $gray !default;
+$volume-track-bg:         darken($controls-bg, 10%) !default;
 $volume-thumb-height:     ($volume-track-height * 2) !default;
 $volume-thumb-width:      ($volume-track-height * 2) !default;
 $volume-thumb-bg:         $control-color !default;
@ -50,18 +52,47 @@ $volume-thumb-bg-focus:   $control-bg-hover !default;
 $bp-control-split:        560px !default; // When controls split into left/right
 $bp-captions-large:       768px !default; // When captions jump to the larger font size

-// Utility classes & mixins
-// -------------------------------
-// Screen reader only
-.sr-only {
-    position: absolute !important;
-    clip: rect(1px, 1px, 1px, 1px);
-    padding: 0 !important;
-    border: 0 !important;
-    height: 1px !important;
-    width: 1px !important;
-    overflow: hidden;
+// Animation
+// ---------------------------------------
+
+@keyframes progress {
+    to { background-position: $progress-loading-size 0; }
 }
+
+// Mixins
+// -------------------------------
+
+// Contrast
+@mixin contrast-control-color($color: "") {
+    @if (lightness($color) >= 65%) {
+        $control-color: $gray-light;
+    }
+    @else if(lightness(@color) < 65%) {
+        $control-color: $gray-lighter;
+    }
+}
+@mixin contrast-control-color-hover($color: "") {
+    @if (lightness($color) >= 65%) {
+        $control-color-hover: $gray;
+    }
+    @else if (lightness($color) < 65%) {
+        $control-color-hover: #fff;
+    }
+}
+
+// Font smoothing
+@mixin font-smoothing($mode: on)
+{
+    @if ($mode == 'on') {
+        -moz-osx-font-smoothing: grayscale;
+        -webkit-font-smoothing: antialiased;
+    } 
+    @else if ($mode == 'off') {
+        -moz-osx-font-smoothing: auto;
+        -webkit-font-smoothing: subpixel-antialiased;
+    }
+}
+
 // Contain floats: nicolasgallagher.com/micro-clearfix-hack/
@mixin clearfix()
 {
@ -77,14 +108,7 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
    outline-offset: 0;
 }

-// Animation
-// ---------------------------------------
-@keyframes progress {
-    to { background-position: $progress-loading-size 0; }
-}
-
-// <input type="range"> styling
-// ---------------------------------------
+// Range mixins
@mixin volume-thumb()
 {
    height: $volume-thumb-height;
@ -115,17 +139,16 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
    border: 0;
 }

-// Font smoothing
-// ---------------------------------------
-@mixin font-smoothing($mode: on)
-{
-    @if $mode == 'on' {
-        -moz-osx-font-smoothing: grayscale;
-        -webkit-font-smoothing: antialiased;
-    } @else if $mode == 'off' {
-        -moz-osx-font-smoothing: auto;
-        -webkit-font-smoothing: subpixel-antialiased;
-    }
+// Screen reader only
+// -------------------------------
+.sr-only {
+    position: absolute !important;
+    clip: rect(1px, 1px, 1px, 1px);
+    padding: 0 !important;
+    border: 0 !important;
+    height: 1px !important;
+    width: 1px !important;
+    overflow: hidden;
 }

 // Styles
@ -149,7 +172,8 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
    &-video-wrapper {
        position: relative;
    }
-    video {
+    video,
+    audio {
        width: 100%;
        height: auto;
        vertical-align: middle;
@ -192,6 +216,7 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
        background: $controls-bg;
        line-height: 1;
        text-align: center;
+        box-shadow: 0 1px 1px rgba(red($gray-dark), green($gray-dark), blue($gray-dark), .2);

        // Layout
        &-right {
@ -215,7 +240,7 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
            margin: 0 2px;
            padding: ($control-spacing / 2) $control-spacing;

-            transition: background .3s ease;
+            background .3s ease, color .3s ease, opacity .3s ease;
            border-radius: 3px;
            cursor: pointer;

@ -229,12 +254,13 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
        }
        input + label,
        .inverted:checked + label {
-            color: $control-color-inactive;
+            opacity: .5;
        }
        button,
        .inverted + label,
        input:checked + label {
            color: $control-color;
+            opacity: 1;
        }
        button {
            border: 0;
@ -249,6 +275,7 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
        [type="checkbox"] + label:hover {
            background: $control-bg-hover;
            color: $control-color-hover;
+            opacity: 1;
        }
        button:focus,
        input:focus + label {
@ -281,13 +308,14 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
            &::before {
                content: "\2044";
                margin-right: $control-spacing;
-                color: darken($control-color, 30%);
            }
        }
    }

    // Tooltips
    &-tooltip {
+        $border-base: darken($tooltip-bg, 8%);
+
        visibility: hidden;
        position: absolute;
        z-index: 2;
@ -297,37 +325,42 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo

        opacity: 0;
        background: $tooltip-bg;
+        border: 1px solid $border-base;
        border-radius: $tooltip-radius;
        color: $tooltip-color;
        font-size: $font-size-small;
        line-height: 1.5;
        font-weight: 600;

-        transform: translate(-50%, ($tooltip-padding * 3));
-        transition: transform .2s .2s ease, opacity .2s .2s ease;
+        transform: translate(-50%, ($tooltip-padding * 3)) scale(0);
+        transform-origin: 50% 100%;
+        transition: transform .2s .1s ease, opacity .2s .1s ease;

+        // Arrow
        &::after {
            content: "";
-            display: block;
            position: absolute;
+            z-index: 1;
+            top: 100%;
            left: 50%;
-            bottom: -$tooltip-arrow-size;
-            margin-left: -$tooltip-arrow-size;
-            width: 0;
-            height: 0;
-            transition: inherit;
-            border-style: solid;
-            border-width: $tooltip-arrow-size $tooltip-arrow-size 0 $tooltip-arrow-size;
-            border-color: $controls-bg transparent transparent;
+            display: block;
+            width: 10px;
+            height: 10px;
+            background: $tooltip-bg;
+            transform: translate(-50%, -50%) rotate(45deg) translateY(2px);
+            
+            $arrow-border-color: darken($border-base, 5%);
+            border: 1px solid rgba(red($arrow-border-color), green($arrow-border-color), blue($arrow-border-color), .8);
+            border-width: 0 1px 1px 0;
        }
    }
    label:hover .player-tooltip,
-    input:focus + label .player-tooltip,
+    input.tab-focus:focus + label .player-tooltip, 
    button:hover .player-tooltip,
-    button:focus .player-tooltip {
+    button.tab-focus:focus .player-tooltip {
        visibility: visible;
        opacity: 1;
-        transform: translate(-50%, 0);
+        transform: translate(-50%, 0) scale(1);
    }
    label:hover .player-tooltip,
    button:hover .player-tooltip {
@ -462,7 +495,7 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
    // Volume control
    // <input[type='range']> element
    // Specificity is for bootstrap compatibility
-    &-volume[type=range] {
+    &-volume[type="range"] {
        display: inline-block;
        vertical-align: middle;
        -webkit-appearance: none;
@ -567,15 +600,6 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
        .player-video-wrapper {
            height: 100%;
            width: 100%;
-
-            .player-captions {
-                top: auto;
-                bottom: 90px;
-
-                @media (min-width: $bp-control-split) {
-                    bottom: 60px;
-                }
-            }
        }
        .player-controls {
            position: absolute;
@ -585,13 +609,29 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
        }

        // Hide controls when playing in full screen
-        &.fullscreen-hide-controls.playing .player-controls {
-            transform: translateY(100%) translateY($control-spacing / 2);
-            transition: transform .3s .2s ease;
-
-            &.hover {
+        &.fullscreen-hide-controls.playing {
+            .player-controls {
+                transform: translateY(100%) translateY($control-spacing / 2);
+                transition: transform .3s .2s ease;
+            }
+            &.player-hover .player-controls {
                transform: translateY(0);
            }
+            .player-captions {
+                bottom: (@control-spacing / 2);
+                transition: bottom .3s .2s ease;
+            }
+        }
+
+        // Captions
+        .player-captions,
+        &.fullscreen-hide-controls.playing.player-hover .player-captions {
+            top: auto;
+            bottom: 90px;
+
+            @media (min-width: $bp-control-split) {
+                bottom: 60px;
+            }
        }
    }
Author	SHA1	Message	Date
Sam Potts	e0cd34c996	Fix for omitted kind attribute on <track> (fixes #88 )	2015-07-25 20:45:11 +10:00
Sam Potts	06641d5709	Docs	2015-07-25 20:29:54 +10:00
Sam Potts	a0d2d5cd24	Minor tweaks	2015-07-25 20:29:19 +10:00
Sam Potts	e9cdbfb8da	Safari fix (fixes #96 ), YouTube tweaks, docs	2015-07-25 19:51:32 +10:00
Sam Potts	df64fdac9e	Tab focus and caption position fixes (fixes #61 , fixes #92 )	2015-07-25 18:30:47 +10:00
Sam Potts	4dbbbd04cc	Merge pull request #99 from ChristianPV/patch-1 Update bower.json - fix sass file name	2015-07-25 10:59:56 +10:00
khrizpv	c9c3ee9014	Update bower.json - fix sass file name I installed this package with bower and encountered an error while checking for existence of main bower files. I changed the filename to the correct one. Please take a look. Thanks!	2015-07-24 11:51:16 -03:00
Sam Potts	67191c2a75	Merge branch 'master' of github.com:selz/plyr	2015-07-22 11:36:35 +10:00
Sam Potts	8ba4522b3e	Docs	2015-07-22 11:36:24 +10:00
Sam Potts	52eaf62b58	Update readme.md	2015-07-21 12:30:41 +10:00
Sam Potts	8d43f412ac	Docs CSS	2015-07-21 10:48:31 +10:00
Sam Potts	e9ea90f527	Update readme.md	2015-07-21 10:38:48 +10:00
Sam Potts	5dc0d84300	Version bump	2015-07-21 08:51:44 +10:00
Sam Potts	ec8923ef08	Merge branch 'master' of github.com:selz/plyr	2015-07-21 08:51:25 +10:00
Sam Potts	5a414572f9	Tooltip fix (Fixes #97 )	2015-07-21 08:51:14 +10:00
Sam Potts	7f40307b0a	Update readme.md	2015-07-20 23:11:11 +10:00
Sam Potts	a12485d10f	Update readme.md	2015-07-20 23:09:57 +10:00
Sam Potts	4695bbf483	Merge branch 'master' of github.com:selz/plyr	2015-07-20 23:04:13 +10:00
Sam Potts	20ee77a55e	Docs tweak	2015-07-20 23:03:24 +10:00
Sam Potts	78a0ac8674	Update readme.md	2015-07-20 22:51:33 +10:00
Sam Potts	e49c417e54	Version bump	2015-07-20 22:32:29 +10:00
Sam Potts	b39961ec49	Tidying	2015-07-20 22:28:27 +10:00
Sam Potts	8894b4c7b9	Merge branch 'master' into develop # Conflicts: # changelog.md # dist/plyr.js	2015-07-20 22:25:31 +10:00
Sam Potts	cdf3deb458	YouTube playback, docs update	2015-07-20 22:24:06 +10:00
Sam Potts	dcd9ca3a93	Started on source swap	2015-07-12 23:57:36 +10:00
Sam Potts	c202cc1ffb	More work on YouTube	2015-07-12 23:41:56 +10:00
Sam Potts	093af22942	More work on YouTube playback	2015-07-12 21:17:56 +10:00
Sam Potts	9d966e41b1	Built	2015-06-27 16:21:54 +10:00
Sam Potts	240aa7aa5f	Merge branch 'master' into develop # Conflicts: # dist/plyr.css # dist/plyr.js	2015-06-27 16:21:38 +10:00
Sam Potts	398815857f	Merge branch 'develop' of github.com:selz/plyr into develop # Conflicts: # .gitignore	2015-05-23 19:58:53 +10:00
Sam Potts	4c5020a396	Ignore test video	2015-05-23 19:58:06 +10:00
Sam Potts	3d1a586314	Working on YouTube playback	2015-04-15 23:50:03 +10:00
Sam Potts	d04b278802	Merge branch 'master' into develop # Conflicts: # src/js/plyr.js	2015-04-15 21:51:59 +10:00
Sam Potts	7345f656c1	Started on plugin setup	2015-04-15 21:47:50 +10:00