Version bump

Make SCSS variables optional

changelog.md

@@ -1,12 +1,45 @@
 # Changelog
 
+## v1.1.13
+- Added icon prefix option for when using default controls
+
+## v1.1.13
+- Logic tweaks for hiding controls in fullscreen
+
+## v1.1.12
+- Bug fix for Chrome Canary
+
+## v1.1.11
+- Bug fix 
+
+## v1.1.10
+- Bug fix 
+
+## v1.1.9
+- Bug fix for 1.1.8
+
+## v1.1.8
+- setVolume API method improvements (Fixes #83)
+
+## v1.1.7
+- Restore classname on destroy()
+
+## v1.1.6
+- New API methods (fixes #77), Fix for non strict mode (fixes #78)
+
+## v1.1.5
+- Fix for incorrect `isFullscreen()` return value in Mozilla (Fixes #38)
+
+## v1.1.4
+- Minor bug fixes
+
 ## v1.1.3
 - Fixes for random id used in controls with multiple instances and one call to setup
 - Audio player UI improvements
 
 ## v1.1.2
 - Added an onSetup callback option
-- Added fullscreen API methods toggleFullscreen() (must be user iniated), and isFullscreen()
+- Added fullscreen API methods `toggleFullscreen()` (must be user iniated), and `isFullscreen()`
 
 ## v1.1.1
 - Fix for unsupported browser handling
@@ -16,7 +49,7 @@
 - Added config option to set which controls are shown (if using the default controls html) and better handling of missing controls
 
 ## v1.0.31
-- Display duration on metadataloaded
+- Display duration on `metadataloaded`
 
 ## v1.0.30
 - Fixed bug with media longer than 60 minutes (Fixes #69)

docs/dist/docs.css

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

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.3/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.1.14/docs.css">
     </head>
     <body>
         <main>

docs/index.html

@@ -8,33 +8,40 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <!-- Styles -->
-        <link rel="stylesheet" href="//cdn.plyr.io/1.1.3/plyr.css">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/plyr.css?1">
 
         <!-- Docs styles -->
-        <link rel="stylesheet" href="//cdn.plyr.io/1.1.3/docs.css">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/docs.css?2">
     </head>
     <body>
         <header>
             <h1>Plyr</h1>
-            <p>A simple HTML5 media player with custom controls and WebVTT captions.</p>
+            <p>A simple HTML5 media player with custom controls and WebVTT captions by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a></p>
-            <a href="https://github.com/selz/plyr" target="_blank" class="btn">Download on GitHub</a>
+            <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>
         </header>
 
         <main>
             <section class="example-video">
                 <div class="player">
-                    <video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
+                    <video poster="https://cdn.plyr.io/static/poster.jpg" controls crossorigin>
                         <!-- Video files -->
-                        <source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
+                        <source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
-                        <source src="//cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
+                        <source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
                         
                         <!-- Text track file -->
-                        <track kind="captions" label="English" srclang="en" src="//cdn.selz.com/plyr/1.0/en.vtt" default>
+                        <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 -->
-                        <div>
+                        <a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-                            <a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-                        </div>
                     </video>
                 </div>
                 <small>Big Buck Bunny. More info can be found at <a href="https://peach.blender.org" target="_blank">peach.blender.org</a>.</small>
@@ -44,13 +51,11 @@
                 <div class="player">
                     <audio controls>
                         <!-- Audio files -->
-                        <source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
+                        <source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
-                        <source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
+                        <source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
                         
                         <!-- Fallback for browsers that don't support the <audio> element -->
-                        <div>
+                        <a href="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
-                            <a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
-                        </div>
                     </audio>
                 </div>
                 <small>"96" by Logistics, which can be purchased from <a href="https://www.hospitalrecords.com/shop/artist/logistics" target="_blank">Hospital Records</a>.</small>
@@ -83,13 +88,13 @@
                     b.insertBefore(c, b.childNodes[0]);
                 }
             }
-        })(document, "https://cdn.plyr.io/1.1.3/sprite.svg");
+        })(document, "https://cdn.plyr.io/1.1.14/sprite.svg");
         </script>
 
         <!-- Plyr core script -->
-        <script src="//cdn.plyr.io/1.1.3/plyr.js"></script>
+        <script src="https://cdn.plyr.io/1.1.14/plyr.js?1"></script>
 
         <!-- Docs script -->
-        <script src="//cdn.plyr.io/1.1.3/docs.js"></script>
+        <script src="https://cdn.plyr.io/1.1.14/docs.js?1"></script>
     </body>
-</html>
+</html>

docs/src/js/docs.js

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

docs/src/less/docs.less

@@ -12,14 +12,16 @@
 // Variables
 // ---------------------------------------
 // Colors
-@blue:                      #3498DB;
+@blue:                      #3498db;
 @gray-dark:                 #343f4a;
 @gray:                      #565d64;
 @gray-light:                #cbd0d3;
+@off-white:                 #f2f5f7;
 
 // Elements
 @link-color:                @blue;
 @padding-base:              20px;
+@arrow-size:                8px;
 
 // Breakpoints
 @screen-md:                 768px;
@@ -33,10 +35,10 @@
 // Base
 body {
     font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    background: #fff;
+    background: @off-white;
     line-height: 1.5;
     text-align: center;
-    color: #6D797F;
+    color: @gray;
 }
 
 // Error page
@@ -102,6 +104,22 @@ section {
 }
 
 // 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;
@@ -119,41 +137,93 @@ a {
         border: 0;
     }
 }
-.btn {
+.btn,
+.btn-count {
     display: inline-block;
-    padding: (@padding-base / 2) (@padding-base * 1.5);
+    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;
-    .font-smoothing(on);
-    font-weight: 600;
-    border-radius: 3px;
-    user-select: none;
     
     &: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%);
+    }
 }
 
-// Players
+// Example players
-.example-audio .player {
-    max-width: 520px;
-}
-.example-video .player {
-    max-width: 1200px;
-}
 .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;

gulpfile.js

@@ -185,12 +185,12 @@ gulp.task("watch", function () {
     // Plyr core
     gulp.watch(paths.plyr.src.js, tasks.js);
     gulp.watch(paths.plyr.src.less, tasks.less);
-    gulp.watch(paths.plyr.src.sprite, "sprite");
+    gulp.watch(paths.plyr.src.sprite, ["sprite"]);
 
     // Docs
     gulp.watch(paths.docs.src.js, tasks.js);
     gulp.watch(paths.docs.src.less, tasks.less);
-    gulp.watch(paths.docs.src.templates, "js");
+    gulp.watch(paths.docs.src.templates, ["js"]);
 });
 
 // Publish a version to CDN and docs
@@ -272,5 +272,5 @@ gulp.task("open", function () {
 
 // Do everything 
 gulp.task("publish", function () {
-    run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs", "open");
+    run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs");
 });

package.json

@@ -1,18 +1,18 @@
 {
   "name": "plyr",
-  "version": "1.1.3",
+  "version": "1.1.14",
   "description": "A simple HTML5 media player using custom controls",
   "homepage": "http://plyr.io",
   "main": "gulpfile.js",
   "dependencies": {},
   "devDependencies": {
-    "gulp": "~3.8.6",
+    "gulp": "^3.8.6",
     "gulp-autoprefixer": "^0.0.8",
-    "gulp-concat": "~2.3.3",
+    "gulp-concat": "^2.3.3",
     "gulp-gzip": "^1.0.0",
     "gulp-hogan-compile": "^0.4.1",
-    "gulp-less": "~1.3.1",
+    "gulp-less": "^1.3.1",
-    "gulp-minify-css": "~0.3.6",
+    "gulp-minify-css": "^0.3.6",
     "gulp-open": "^0.3.2",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.3",
@@ -21,8 +21,8 @@
     "gulp-size": "^1.2.1",
     "gulp-svgmin": "^1.0.0",
     "gulp-svgstore": "^5.0.0",
-    "gulp-uglify": "~0.3.1",
+    "gulp-uglify": "^0.3.1",
-    "gulp-util": "~2.2.20",
+    "gulp-util": "^2.2.20",
     "run-sequence": "^0.3.6"
   },
   "scripts": {

readme.md

@@ -25,11 +25,10 @@ Oh and yes, it works with Bootstrap.
 Check out [the changelog](changelog.md)
 
 ## Planned development
-- Accept a string selector, a node, or a nodelist for the `container` property of `selectors`.
-- Multiple language captions (with selection)
 - Playlists (audio and video)
-- Set source by API
+- YouTube and Vimeo support
-- Tooltip option (for seeking and controls)
+- Playback speed
+- Multiple language captions (with selection)
 ... and whatever else has been raised in [issues](https://github.com/Selz/plyr/issues)
 
 If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or of course, forking and sending a pull request.
@@ -38,7 +37,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.3/plyr.js` to `https://cdn.plyr.io/1.1.3/plyr.js`
+**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.14/plyr.js` to `https://cdn.plyr.io/1.1.14/plyr.js`
 
 ### Bower
 If bower is your thang, you can grab Plyr using:
@@ -55,14 +54,14 @@ ember addon:install ember-cli-plyr
 More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub](https://github.com/louisrudner/ember-cli-plyr)
 
 ### CDN 
-If you want to use our CDN, you can use the following. HTTPS (SSL) is supported.
+If you want to use our CDN, you can use the following:
 
 ```html
-<link rel="stylesheet" href="//cdn.plyr.io/1.1.3/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/plyr.css">
-<script src="//cdn.plyr.io/1.1.3/plyr.js"></script>
+<script src="https://cdn.plyr.io/1.1.14/plyr.js"></script>
 ```
 
-You can also access the `sprite.svg` file at `//cdn.plyr.io/1.1.3/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.14/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. 
@@ -99,18 +98,16 @@ and the AJAX technique here:
 The only extra markup that's needed to use plyr is a `<div>` wrapper. Replace the source, poster and captions with urls for your media.
 ```html
 <div class="player">
-	<video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
+	<video poster="https://cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
 		<!-- Video files -->
-		<source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
+		<source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
-		<source src="//cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
+		<source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
 		
 		<!-- Text track file -->
-		<track kind="captions" label="English captions" src="//cdn.selz.com/plyr/1.0/movie_captions_en.vtt" srclang="en" default>
+		<track kind="captions" label="English captions" src="https://cdn.selz.com/plyr/1.0/movie_captions_en.vtt" srclang="en" default>
 		
 		<!-- Fallback for browsers that don't support the <video> element -->
-		<div>
+		<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-			<a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-		</div>
 	</video>
 </div>
 ```
@@ -120,13 +117,11 @@ And the same for `<audio>`
 <div class="player">
 	<audio controls>
 		<!-- Audio files -->
-		<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
+		<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
-    <source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
+		<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
 		
 		<!-- Fallback for browsers that don't support the <audio> element -->
-		<div>
+		<a href="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
-			<a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
-		</div>
 	</audio>
 </div>
 ```	
@@ -138,20 +133,16 @@ More info on CORS here:
 [https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS)
 
 ### JavaScript
-Much of the behaviour of the player is configurable when initialising the library. Below is an example of a default instance.
+Much of the behaviour of the player is configurable when initialising the library. Here's an example of a default setup:
 
 ```html
 <script src="dist/plyr.js"></script>
-<script>
+<script>plyr.setup();</script>
-plyr.setup({
-	*options*
-});
-</script>
 ```
 
 #### Options
 
-You can pass the following options to the setup method.
+You can pass the following options to the setup method using `plyr.setup({...})`.
 
 <table class="table" width="100%">
 <thead>
@@ -181,6 +172,12 @@ You can pass the following options to the setup method.
     <td><code>["restart", "rewind", "play", "fast-forward", "current-time", "duration", "mute", "volume", "captions", "fullscreen"]</code></td>
     <td>Toggle which control elements you would like to display when using the default controls html. If you specify a <code>html</code> option, this is redundant. The default value is to display everything.</td>
   </tr>
+  <tr>
+    <td><code>iconPrefix</code></td>
+    <td>String</td>
+    <td><code>icon</code></td>
+    <td>Specify the id prefix for the icons used in the default controls (e.g. "icon-play" would be "icon"). This is to prevent clashes if you're using your own SVG defs file but with the default controls. Most people can ignore this option.</td>
+  </tr>
   <tr>
     <td><code>debug</code></td>
     <td>Boolean</td>
@@ -310,6 +307,11 @@ Here's a list of the methods supported:
     <td>Number</td>
     <td>Sets the player volume to the provided parameter. The value should be between 0 (muted) and 10 (loudest). If no parameter is provided, the default volume is used (5). Values over 10 are ignored.</td>
   </tr>
+  <tr>
+    <td><code>togglePlay()</code></td>
+    <td>Boolean</td>
+    <td>Toggles playback for the player based on either the boolean argument or it's current state.</td>
+  </tr>
   <tr>
     <td><code>toggleMute()</code></td>
     <td>&mdash;</td>
@@ -355,6 +357,16 @@ Here's a list of the methods supported:
     <td>String</td>
     <td>Set the poster url. This is supported for the <code>video</code> element only.</td>
   </tr>
+  <tr>
+    <td><code>destroy()</code></td>
+    <td>&mdash;</td>
+    <td>Destroys the plyr UI and any media event listeners, effectively restoring to the previous state before <code>setup()</code> was called.</td>
+  </tr>
+  <tr>
+    <td><code>restore()</code></td>
+    <td>&mdash;</td>
+    <td>Reverses the effects of the <code>destroy()</code> method, restoring the UI and listeners.</td>
+  </tr>
  </tbody>
 </table>
 
@@ -423,7 +435,7 @@ There's an API method for checking support. You can call `plyr.supported()` and
 If you find anything weird with Plyr, please let us know using the GitHub issues tracker.
 
 ## Author
-Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me)
+Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me) with help from the awesome [contributors](https://github.com/Selz/plyr/graphs/contributors) 
 
 ## Mentions
 - [The Changelog](http://thechangelog.com/plyr-simple-html5-media-player-custom-controls-webvtt-captions/)
@@ -451,4 +463,4 @@ Also these links helped created Plyr:
 - [Styling the `<progress>` element - hongkiat.com](http://www.hongkiat.com/blog/html5-progress-bar/)
 
 ## Copyright and License
-[The MIT license](license.md).
+[The MIT license](license.md).

src/js/plyr.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.1.2
+// plyr.js v1.1.14
 // https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -22,6 +22,7 @@
         click:                  true,
         tooltips:               false,
         displayDuration:        true,
+        iconPrefix:             "icon",
         selectors: {
             container:          ".player",
             controls:           ".player-controls",
@@ -105,7 +106,7 @@
         if(_inArray(config.controls, "restart")) {
             html.push(
                 "<button type='button' data-player='restart'>",
-                    "<svg><use xlink:href='#icon-restart'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-restart'></use></svg>",
                     "<span class='sr-only'>Restart</span>",
                 "</button>"
             );
@@ -115,7 +116,7 @@
         if(_inArray(config.controls, "rewind")) {
             html.push(
                 "<button type='button' data-player='rewind'>",
-                    "<svg><use xlink:href='#icon-rewind'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-rewind'></use></svg>",
                     "<span class='sr-only'>Rewind {seektime} secs</span>",
                 "</button>"
             );
@@ -125,11 +126,11 @@
         if(_inArray(config.controls, "play")) {
             html.push(
                 "<button type='button' data-player='play'>",
-                    "<svg><use xlink:href='#icon-play'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-play'></use></svg>",
                     "<span class='sr-only'>Play</span>",
                 "</button>",
                 "<button type='button' data-player='pause'>",
-                    "<svg><use xlink:href='#icon-pause'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-pause'></use></svg>",
                     "<span class='sr-only'>Pause</span>",
                 "</button>"
             );
@@ -139,7 +140,7 @@
         if(_inArray(config.controls, "fast-forward")) {
             html.push(
                 "<button type='button' data-player='fast-forward'>",
-                    "<svg><use xlink:href='#icon-fast-forward'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-fast-forward'></use></svg>",
                     "<span class='sr-only'>Forward {seektime} secs</span>",
                 "</button>"
             );
@@ -176,8 +177,8 @@
             html.push(
                 "<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>",
                 "<label id='mute{id}' for='mute{id}'>",
-                    "<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>",
+                    "<svg class='icon-muted'><use xlink:href='#" + config.iconPrefix + "-muted'></use></svg>",
-                    "<svg><use xlink:href='#icon-volume'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-volume'></use></svg>",
                     "<span class='sr-only'>Toggle Mute</span>",
                 "</label>"
             );
@@ -196,8 +197,8 @@
             html.push(
                 "<input class='sr-only' id='captions{id}' type='checkbox' data-player='captions'>",
                 "<label for='captions{id}'>",
-                    "<svg class='icon-captions-on'><use xlink:href='#icon-captions-on'></use></svg>",
+                    "<svg class='icon-captions-on'><use xlink:href='#" + config.iconPrefix + "-captions-on'></use></svg>",
-                    "<svg><use xlink:href='#icon-captions-off'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-captions-off'></use></svg>",
                     "<span class='sr-only'>Toggle Captions</span>",
                 "</label>"
             );
@@ -207,8 +208,8 @@
         if(_inArray(config.controls, "fullscreen")) {
             html.push(
                 "<button type='button' data-player='fullscreen'>",
-                    "<svg class='icon-exit-fullscreen'><use xlink:href='#icon-exit-fullscreen'></use></svg>",
+                    "<svg class='icon-exit-fullscreen'><use xlink:href='#" + config.iconPrefix + "-exit-fullscreen'></use></svg>",
-                    "<svg><use xlink:href='#icon-enter-fullscreen'></use></svg>",
+                    "<svg><use xlink:href='#" + config.iconPrefix + "-enter-fullscreen'></use></svg>",
                     "<span class='sr-only'>Toggle Fullscreen</span>",
                 "</button>"
             );
@@ -366,12 +367,28 @@
             // append it to the parent.
             if (sibling) {
                 parent.insertBefore(child, sibling);
-            } else {
+            } 
+            else {
                 parent.appendChild(child);
             }
         }
     }
 
+    // Unwrap an element
+    // http://plainjs.com/javascript/manipulation/unwrap-a-dom-element-35/
+    function _unwrap(wrapper) {
+        // Get the element's parent node
+        var parent = wrapper.parentNode;
+
+        // Move all children out of the element
+        while (wrapper.firstChild) {
+            parent.insertBefore(wrapper.firstChild, wrapper);
+        }
+
+        // Remove the empty element
+        parent.removeChild(wrapper);
+    }
+
     // Remove an element
     function _remove(element) {
         element.parentNode.removeChild(element);
@@ -404,7 +421,7 @@
 
     // Toggle event
     function _toggleHandler(element, events, callback, toggle) {
-        events = events.split(" ");
+        var eventList = events.split(" ");
 
         // If a nodelist is passed, call itself on each node
         if(element instanceof NodeList) {
@@ -417,8 +434,8 @@
         }
 
         // If a single node is passed, bind the event listener
-        for (var i = 0; i < events.length; i++) {
+        for (var i = 0; i < eventList.length; i++) {
-            element[toggle ? "addEventListener" : "removeEventListener"](events[i], callback, false);
+            element[toggle ? "addEventListener" : "removeEventListener"](eventList[i], callback, false);
         }
     }
 
@@ -541,6 +558,8 @@
                 switch (this.prefix) {
                     case "":
                         return document.fullscreenElement == element;
+                    case "moz":
+                        return document.mozFullScreenElement == element;
                     default:
                         return document[this.prefix + "FullscreenElement"] == element;
                 }
@@ -883,13 +902,13 @@
                     // Enable UI
                     _showCaptions(player);
 
-                    // If IE 10/11 or Firefox 31+ or Safari 7+, don"t use native captioning (still doesn"t work although they claim it"s now supported)
+                    // Disable unsupported browsers than report false positive
-                    if ((player.browser.name === "IE" && player.browser.version === 10) || 
+                    if ((player.browser.name === "IE" && player.browser.version >= 10) || 
-                            (player.browser.name === "IE" && player.browser.version === 11) || 
+                        (player.browser.name === "Firefox" && player.browser.version >= 31) || 
-                            (player.browser.name === "Firefox" && player.browser.version >= 31) || 
+                        (player.browser.name === "Chrome" && player.browser.version >= 43) || 
-                            (player.browser.name === "Safari" && player.browser.version >= 7)) {
+                        (player.browser.name === "Safari" && player.browser.version >= 7)) {
                         // Debugging
-                        _log("Detected IE 10/11 or Firefox 31+ or Safari 7+.");
+                        _log("Detected unsupported browser for HTML5 captions. Using fallback.");
 
                         // Set to false so skips to "manual" captioning
                         player.usingTextTracks = false;
@@ -1009,6 +1028,22 @@
             player.media.pause();
         }
 
+        // Toggle playback
+        function _togglePlay(toggle) {
+            // Play
+            if(toggle === true) {
+                _play();
+            }
+            // Pause
+            else if(toggle === false) {
+                _pause();
+            }
+            // True toggle
+            else {
+                player.media[player.media.paused ? "play" : "pause"]();
+            }
+        }
+
         // Rewind
         function _rewind(seekTime) {
             // Use default if needed
@@ -1111,6 +1146,41 @@
 
             // Set class hook
             _toggleClass(player.container, config.classes.fullscreen.active, player.isFullscreen);
+            
+            // Toggle controls visibility based on mouse movement and location
+            var hoverTimer, isMouseOver = false;
+
+            // Show the player controls
+            function _showControls() {
+                // Set shown class
+                _toggleClass(player.controls, config.classes.hover, true);
+
+                // Clear timer every movement
+                window.clearTimeout(hoverTimer);
+
+                // 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);
+                    }, 2000);
+                }
+            }
+
+            // Check mouse is over the controls
+            function _setMouseOver (event) {
+                isMouseOver = (event.type === "mouseenter");
+            }
+
+            if(config.fullscreen.hideControls) {           
+                // Hide on entering full screen
+                _toggleClass(player.controls, config.classes.hover, false);
+
+                // Keep an eye on the mouse location in relation to controls
+                _toggleHandler(player.controls, "mouseenter mouseleave", _setMouseOver, player.isFullscreen);
+
+                // Show the controls on mouse move
+                _toggleHandler(player.container, "mousemove", _showControls, player.isFullscreen);
+            }
         }
 
         // Bail from faux-fullscreen 
@@ -1123,40 +1193,32 @@
 
         // Set volume
         function _setVolume(volume) {
-            // Bail if there's no volume element
+            // Use default if no value specified
-            if(!player.volume) {
-                return;
-            }
-
-            // Use default if needed
             if(typeof volume === "undefined") {
                 if(config.storage.enabled && _storage().supported) {
                     volume = window.localStorage[config.storage.key] || config.volume;
                 }
                 else {
                     volume = config.volume;
-                }
+                }                
             }
+
             // Maximum is 10
             if(volume > 10) {
                 volume = 10;
             }
-
+            // Minimum is 0
-            // If the controls are there
+            if(volume < 0) {
-            if(player.supported.full) {
+                volume = 0;
-                player.volume.value = volume;
             }
 
             // Set the player volume
             player.media.volume = parseFloat(volume / 10);
 
-            // Update the UI
+            // Toggle muted state
-            _checkMute();
+            if(player.media.muted && volume > 0) {
-
+                _toggleMute();
-            // Store the volume in storage
+            } 
-            if(config.storage.enabled && _storage().supported) {
-                window.localStorage.setItem(config.storage.key, volume);
-            }
         }
 
         // Mute
@@ -1166,16 +1228,32 @@
                 muted = !player.media.muted;
             }
 
-            // If the controls are there
-            if(player.supported.full) {
-                player.buttons.mute.checked = muted;
-            }
-
             // Set mute on the player
             player.media.muted = muted;
+        }
 
-            // Update UI
+        // Update volume UI and storage
-            _checkMute();
+        function _updateVolume() {
+            // Get the current volume
+            var volume = player.media.muted ? 0 : (player.media.volume * 10);
+
+            // Update the <input type="range"> if present
+            if(player.supported.full && player.volume) {
+                player.volume.value = volume;
+            }
+
+            // Store the volume in storage
+            if(config.storage.enabled && _storage().supported) {
+                window.localStorage.setItem(config.storage.key, volume);
+            }
+
+            // Toggle class if muted
+            _toggleClass(player.container, config.classes.muted, (volume === 0));
+            
+            // Update checkbox for mute state
+            if(player.supported.full && player.buttons.mute) {
+                player.buttons.mute.checked = (volume === 0);
+            }
         }
 
         // Toggle captions
@@ -1194,11 +1272,6 @@
             _toggleClass(player.container, config.classes.captions.active, show);
         }
 
-        // Check mute state
-        function _checkMute() {
-            _toggleClass(player.container, config.classes.muted, (player.media.volume === 0 || player.media.muted));
-        }
-
         // Check if media is loading
         function _checkLoading(event) {
             var loading = (event.type === "waiting");
@@ -1470,7 +1543,7 @@
             _on(player.media, "playing", _updateProgress);
 
             // Handle native mute
-            _on(player.media, "volumechange", _checkMute);
+            _on(player.media, "volumechange", _updateVolume);
 
             // Handle native play/pause
             _on(player.media, "play pause", _checkPlaying);
@@ -1485,27 +1558,63 @@
             if(player.type === "video" && config.click) {
                 _on(player.videoContainer, "click", function() {
                     if(player.media.paused) {
-                        _play();
+                        _triggerEvent(player.buttons.play, "click");
                     }
                     else if(player.media.ended) {
                         _seek();
-                        _play();
+                        _triggerEvent(player.buttons.play, "click");
                     }
                     else {
-                        _pause();
+                        _triggerEvent(player.buttons.pause, "click");
                     }
                 });
             }
-
-            // Bind to mouse hover 
-            if(config.fullscreen.hideControls) {
-                _on(player.controls, "mouseenter mouseleave", function(event) {
-                    _toggleClass(player.controls, config.classes.hover, (event.type === "mouseenter"));
-                })
-            }
         }
 
+        // Destroy an instance
+        function _destroy() {
+            // Bail if the element is not initialized
+            if(!player.init) {
+                return null;
+            }
+
+            // 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 controls
+            _remove(_getElement(config.selectors.controls));
+
+            // If video, we need to remove some more
+            if(player.type === "video") {
+                // Remove captions
+                _remove(_getElement(config.selectors.captions));
+
+                // Remove video wrapper
+                _unwrap(player.videoContainer);
+            }
+
+            // Restore native video controls
+            player.media.setAttribute("controls", "");
+
+            // Clone the media element to remove listeners
+            // 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
         function _init() {
+            // Bail if the element is initialized
+            if(player.init) {
+                return null;
+            }
+
             // Setup the fullscreen api 
             fullscreen = _fullscreen();
 
@@ -1555,6 +1664,7 @@
 
                 // Set volume
                 _setVolume();
+                _updateVolume();
 
                 // Setup fullscreen
                 _setupFullscreen();
@@ -1564,10 +1674,14 @@
             }
 
             // Successful setup
-            return true;
+            player.init = true;
         }
 
-        if(!_init()) {
+        // Initialize instance 
+        _init();
+
+        // If init failed, return an empty object
+        if(!player.init) {
             return {};
         }
 
@@ -1582,11 +1696,14 @@
             source:             _parseSource,
             poster:             _updatePoster,
             setVolume:          _setVolume,
+            togglePlay:         _togglePlay,
             toggleMute:         _toggleMute,
             toggleCaptions:     _toggleCaptions,
             toggleFullscreen:   _toggleFullscreen,
             isFullscreen:       function() { return player.isFullscreen || false; },
-            support:            function(mimeType) { return _supportMime(player, mimeType); }
+            support:            function(mimeType) { return _supportMime(player, mimeType); },
+            destroy:            _destroy,
+            restore:            _init
         }
     }
 

src/less/plyr.less

@@ -9,7 +9,7 @@
 @gray-dark:                 #343f4a;
 @gray:                      #565d64;
 @gray-light:                #cbd0d3;
-@off-white:                 #f9fafb;
+@off-white:                 #d6dadd;
 
 // Font sizes
 @font-size-small:           14px;
@@ -463,7 +463,8 @@
         margin: 0 @control-spacing 0 0;
         padding: 0;     
         cursor: pointer;
-        background: none;
+        background: transparent;
+        border: none;
         
         // Webkit
         &::-webkit-slider-runnable-track {
@@ -563,12 +564,9 @@
                 top: auto;
                 bottom: 90px;
 
-                @media (min-width: @bp-control-split) and (max-width: (@bp-captions-large - 1)) {
+                @media (min-width: @bp-control-split) {
                     bottom: 60px;
                 }
-                @media (min-width: @bp-captions-large) {
-                    bottom: 80px;
-                }
             }
         }
         .player-controls {
@@ -581,11 +579,10 @@
         // Hide controls when playing in full screen
         &.fullscreen-hide-controls.playing .player-controls {
             transform: translateY(100%) translateY(@control-spacing / 2);
-            transition: transform .3s 1s ease;
+            transition: transform .3s .2s ease;
 
             &.hover {
                 transform: translateY(0);
-                transition-delay: 0;
             }
         }
     }

src/sass/plyr.scss

@@ -5,50 +5,50 @@
 // Variables
 // -------------------------------
 // Colors
-$blue:                    #3498DB;
+$blue:                    #3498DB !default;
-$gray-dark:               #343f4a;
+$gray-dark:               #343f4a !default;
-$gray:                    #565d64;
+$gray:                    #565d64 !default;
-$gray-light:              #cbd0d3;
+$gray-light:              #cbd0d3 !default;
-$off-white:               #f9fafb;
+$off-white:               #d6dadd !default;
 
 // Font sizes
-$font-size-small:         14px;
+$font-size-small:         14px !default;
-$font-size-base:          16px;
+$font-size-base:          16px !default;
-$font-size-large:         ceil(($font-size-base * 1.5));
+$font-size-large:         ceil(($font-size-base * 1.5)) !default;
 
 // Controls
-$control-spacing:         10px;
+$control-spacing:         10px !default;
-$controls-bg:             $gray-dark;
+$controls-bg:             $gray-dark !default;
-$control-bg-hover:        $blue;
+$control-bg-hover:        $blue !default;
-$control-color:           $gray-light;
+$control-color:           $gray-light !default;
-$control-color-inactive:  $gray;
+$control-color-inactive:  $gray !default;
-$control-color-hover:     #fff;
+$control-color-hover:     #fff !default;
 
 // Tooltips
-$tooltip-bg:              $controls-bg;
+$tooltip-bg:              $controls-bg !default;
-$tooltip-color:           #fff;
+$tooltip-color:           #fff !default;
-$tooltip-padding:         $control-spacing;
+$tooltip-padding:         $control-spacing !default;
-$tooltip-arrow-size:      5px;
+$tooltip-arrow-size:      5px !default;
-$tooltip-radius:          3px;
+$tooltip-radius:          3px !default;
 
 // Progress
-$progress-bg:             rgba(red($gray), green($gray), blue($gray), .2);
+$progress-bg:             rgba(red($gray), green($gray), blue($gray), .2) !default;
-$progress-playing-bg:     $blue;
+$progress-playing-bg:     $blue !default;
-$progress-buffered-bg:    rgba(red($gray), green($gray), blue($gray), .25);
+$progress-buffered-bg:    rgba(red($gray), green($gray), blue($gray), .25) !default;
-$progress-loading-size:   40px;
+$progress-loading-size:   40px !default;
-$progress-loading-bg:     rgba(0,0,0, .15);
+$progress-loading-bg:     rgba(0,0,0, .15) !default;
 
 // Volume
-$volume-track-height:     6px;
+$volume-track-height:     6px !default;
-$volume-track-bg:         $gray;
+$volume-track-bg:         $gray !default;
-$volume-thumb-height:     ($volume-track-height * 2);
+$volume-thumb-height:     ($volume-track-height * 2) !default;
-$volume-thumb-width:      ($volume-track-height * 2);
+$volume-thumb-width:      ($volume-track-height * 2) !default;
-$volume-thumb-bg:         $control-color;
+$volume-thumb-bg:         $control-color !default;
-$volume-thumb-bg-focus:   $control-bg-hover;
+$volume-thumb-bg-focus:   $control-bg-hover !default;
 
 // Breakpoints
-$bp-control-split:        560px; // When controls split into left/right
+$bp-control-split:        560px !default; // When controls split into left/right
-$bp-captions-large:       768px; // When captions jump to the larger font size
+$bp-captions-large:       768px !default; // When captions jump to the larger font size
 
 // Utility classes & mixins
 // -------------------------------
@@ -471,7 +471,8 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
         margin: 0 $control-spacing 0 0;
         padding: 0;
         cursor: pointer;
-        background: none;
+        background: transparent;
+        border: none;
 
         // Webkit
         &::-webkit-slider-runnable-track {
@@ -571,12 +572,9 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
                 top: auto;
                 bottom: 90px;
 
-                @media (min-width: $bp-control-split) and (max-width: ($bp-captions-large - 1)) {
+                @media (min-width: $bp-control-split) {
                     bottom: 60px;
                 }
-                @media (min-width: $bp-captions-large) {
-                    bottom: 80px;
-                }
             }
         }
         .player-controls {
@@ -589,11 +587,10 @@ $bp-captions-large:       768px; // When captions jump to the larger font size
         // Hide controls when playing in full screen
         &.fullscreen-hide-controls.playing .player-controls {
             transform: translateY(100%) translateY($control-spacing / 2);
-            transition: transform .3s 1s ease;
+            transition: transform .3s .2s ease;
 
             &.hover {
                 transform: translateY(0);
-                transition-delay: 0;
             }
         }
     }