Keyboard accessibility improvements (Fixes #66 )

- Enter now works on checkboxes within the controls
Version bump
2015-03-21 17:00:05 +11:00 · 2015-03-15 10:18:56 +11:00 · 2015-03-15 10:14:00 +11:00 · 2015-03-15 10:12:36 +11:00 · 2015-03-15 10:00:00 +11:00 · 2015-03-14 15:50:32 -03:00
21 changed files with 1616 additions and 1492 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,13 @@
 # Changelog

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

--- a/controls.md
+++ b/controls.md
@ -31,7 +31,7 @@ This is the default `html` option from `plyr.js`.
            "<span>0</span>% buffered",
        "</progress>",
    "</div>",
-    "<span class='player-controls-playback'>",
+    "<span class='player-controls-left'>",
        "<button type='button' data-player='restart'>",
            "<svg><use xlink:href='#icon-restart'></use></svg>",
            "<span class='sr-only'>Restart</span>",
@ -57,7 +57,7 @@ This is the default `html` option from `plyr.js`.
            "<span class='player-duration'>00:00</span>",
        "</span>",
    "</span>",
-    "<span class='player-controls-sound'>",
+    "<span class='player-controls-right'>",
        "<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>",
        "<label id='mute{id}' for='mute{id}'>",
            "<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>",
--- a/dist/plyr.css
+++ b/dist/plyr.css
--- a/dist/plyr.js
+++ b/dist/plyr.js
--- a/docs/dist/docs.js
+++ b/docs/dist/docs.js
--- a/docs/dist/templates.js
+++ b/docs/dist/templates.js
@ -1,2 +1,2 @@
    var templates = {};
-    templates['controls'] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||"");t.b("<div class=\"player-controls\">");t.b("\n" + i);t.b("	<div class=\"player-progress\">");t.b("\n" + i);t.b("		<label for=\"seek{id}\" class=\"sr-only\">Seek</label>");t.b("\n" + i);t.b("		<input id=\"seek{id}\" class=\"player-progress-seek\" type=\"range\" min=\"0\" max=\"100\" step=\"0.5\" value=\"0\" data-player=\"seek\">");t.b("\n" + i);t.b("		<progress class=\"player-progress-played\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("			<span>0</span>% played");t.b("\n" + i);t.b("		</progress>");t.b("\n" + i);t.b("		<progress class=\"player-progress-buffer\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("			<span>0</span>% buffered");t.b("\n" + i);t.b("		</progress>");t.b("\n" + i);t.b("	</div>");t.b("\n" + i);t.b("	<span class=\"player-controls-playback\">");t.b("\n" + i);t.b("		<button type=\"button\" data-player=\"restart\">");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-restart\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Restart</span>");t.b("\n" + i);t.b("		</button>");t.b("\n" + i);t.b("		<button type=\"button\" data-player=\"rewind\">");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-rewind\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Rewind {seektime} secs</span>");t.b("\n" + i);t.b("		</button>");t.b("\n" + i);t.b("		<button type=\"button\" data-player=\"play\">");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-play\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Play</span>");t.b("\n" + i);t.b("		</button>");t.b("\n" + i);t.b("		<button type=\"button\" data-player=\"pause\">");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-pause\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Pause</span>");t.b("\n" + i);t.b("		</button>");t.b("\n" + i);t.b("		<button type=\"button\" data-player=\"fast-forward\">");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-fast-forward\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Forward {seektime} secs</span>");t.b("\n" + i);t.b("		</button>");t.b("\n" + i);t.b("		<span class=\"player-time\">");t.b("\n" + i);t.b("			<span class=\"sr-only\">Time</span>");t.b("\n" + i);t.b("			<span class=\"player-duration\">00:00</span>");t.b("\n" + i);t.b("		</span>");t.b("\n" + i);t.b("	</span>");t.b("\n" + i);t.b("	<span class=\"player-controls-sound\">");t.b("\n" + i);t.b("		<input class=\"inverted sr-only\" id=\"mute{id}\" type=\"checkbox\" data-player=\"mute\">");t.b("\n" + i);t.b("		<label id=\"mute{id}\" for=\"mute{id}\">");t.b("\n" + i);t.b("			<svg class=\"icon-muted\"><use xlink:href=\"#icon-muted\"></use></svg>");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-volume\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Toggle Mute</span>");t.b("\n" + i);t.b("		</label>");t.b("\n");t.b("\n" + i);t.b("		<label for=\"volume{id}\" class=\"sr-only\">Volume</label>");t.b("\n" + i);t.b("		<input id=\"volume{id}\" class=\"player-volume\" type=\"range\" min=\"0\" max=\"10\" step=\"0.5\" value=\"0\" data-player=\"volume\">");t.b("\n");t.b("\n" + i);t.b("		<input class=\"sr-only\" id=\"captions{id}\" type=\"checkbox\" data-player=\"captions\">");t.b("\n" + i);t.b("		<label for=\"captions{id}\">");t.b("\n" + i);t.b("			<svg class=\"icon-captions-on\"><use xlink:href=\"#icon-captions-on\"></use></svg>");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-captions-off\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Toggle Captions</span>");t.b("\n" + i);t.b("		</label>");t.b("\n");t.b("\n" + i);t.b("		<button type=\"button\" data-player=\"fullscreen\">");t.b("\n" + i);t.b("			<svg class=\"icon-exit-fullscreen\"><use xlink:href=\"#icon-exit-fullscreen\"></use></svg>");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-enter-fullscreen\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">Toggle Fullscreen</span>");t.b("\n" + i);t.b("		</button>");t.b("\n" + i);t.b("	</span>");t.b("\n" + i);t.b("</div>");return t.fl(); },partials: {}, subs: {  }});
+    templates['controls'] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||"");t.b("<div class=\"player-controls\">");t.b("\n" + i);t.b("    <div class=\"player-progress\">");t.b("\n" + i);t.b("        <label for=\"seek{id}\" class=\"sr-only\">Seek</label>");t.b("\n" + i);t.b("        <input id=\"seek{id}\" class=\"player-progress-seek\" type=\"range\" min=\"0\" max=\"100\" step=\"0.5\" value=\"0\" data-player=\"seek\">");t.b("\n" + i);t.b("        <progress class=\"player-progress-played\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% played");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("        <progress class=\"player-progress-buffer\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% buffered");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("    </div>");t.b("\n" + i);t.b("    <span class=\"player-controls-left\">");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"restart\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-restart\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Restart</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"rewind\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-rewind\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Rewind {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"play\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-play\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Play</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"pause\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-pause\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Pause</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fast-forward\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-fast-forward\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Forward {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <span class=\"player-time\">");t.b("\n" + i);t.b("            <span class=\"sr-only\">Time</span>");t.b("\n" + i);t.b("            <span class=\"player-duration\">00:00</span>");t.b("\n" + i);t.b("        </span>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("    <span class=\"player-controls-right\">");t.b("\n" + i);t.b("        <input class=\"inverted sr-only\" id=\"mute{id}\" type=\"checkbox\" data-player=\"mute\">");t.b("\n" + i);t.b("        <label id=\"mute{id}\" for=\"mute{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-muted\"><use xlink:href=\"#icon-muted\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-volume\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Mute</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <label for=\"volume{id}\" class=\"sr-only\">Volume</label>");t.b("\n" + i);t.b("        <input id=\"volume{id}\" class=\"player-volume\" type=\"range\" min=\"0\" max=\"10\" step=\"0.5\" value=\"0\" data-player=\"volume\">");t.b("\n");t.b("\n" + i);t.b("        <input class=\"sr-only\" id=\"captions{id}\" type=\"checkbox\" data-player=\"captions\">");t.b("\n" + i);t.b("        <label for=\"captions{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-captions-on\"><use xlink:href=\"#icon-captions-on\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-captions-off\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Captions</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fullscreen\">");t.b("\n" + i);t.b("            <svg class=\"icon-exit-fullscreen\"><use xlink:href=\"#icon-exit-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-enter-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Fullscreen</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("</div>");return t.fl(); },partials: {}, subs: {  }});
--- 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.0.24/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/docs.css">
    </head>
    <body>
        <main>
--- a/docs/index.html
+++ b/docs/index.html
@ -8,10 +8,10 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">

        <!-- Styles -->
-		<link rel="stylesheet" href="//cdn.plyr.io/1.0.24/plyr.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css">

        <!-- Docs styles -->
-		<link rel="stylesheet" href="//cdn.plyr.io/1.0.24/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.0.27/docs.css">
    </head>
    <body>
        <header>
@ -67,13 +67,13 @@
        <!-- Load SVG defs -->
        <!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
        <script>
-		(function(d,p){var a=new XMLHttpRequest(),b=d.body;a.open("GET",p,!0);a.send();a.onload=function(){var c=d.createElement("div");c.style.display="none";c.innerHTML=a.responseText;b.insertBefore(c,b.childNodes[0])}})(document,"//cdn.plyr.io/1.0.24/sprite.svg");
+        (function(d,p){var a=new XMLHttpRequest(),b=d.body;a.open("GET",p,!0);a.send();a.onload=function(){var c=d.createElement("div");c.style.display="none";c.innerHTML=a.responseText;b.insertBefore(c,b.childNodes[0])}})(document,"//cdn.plyr.io/1.0.27/sprite.svg");
        </script>

        <!-- Plyr core script -->
-		<script src="//cdn.plyr.io/1.0.24/plyr.js"></script>
+        <script src="//cdn.plyr.io/1.0.27/plyr.js"></script>

        <!-- Docs script -->
-		<script src="//cdn.plyr.io/1.0.24/docs.js"></script>
+        <script src="//cdn.plyr.io/1.0.27/docs.js"></script>
    </body>
 </html>
--- a/docs/src/js/docs.js
+++ b/docs/src/js/docs.js
@ -11,8 +11,7 @@ plyr.setup({
 	html: 	templates.controls.render({}),
 	captions: {
 		defaultActive: true
-	},
-	tooltips: true
+	}
 });

 // Google analytics 
--- a/docs/src/templates/controls.html
+++ b/docs/src/templates/controls.html
@ -9,7 +9,7 @@
            <span>0</span>% buffered
        </progress>
    </div>
-	<span class="player-controls-playback">
+    <span class="player-controls-left">
        <button type="button" data-player="restart">
            <svg><use xlink:href="#icon-restart"></use></svg>
            <span class="sr-only">Restart</span>
@ -35,7 +35,7 @@
            <span class="player-duration">00:00</span>
        </span>
    </span>
-	<span class="player-controls-sound">
+    <span class="player-controls-right">
        <input class="inverted sr-only" id="mute{id}" type="checkbox" data-player="mute">
        <label id="mute{id}" for="mute{id}">
            <svg class="icon-muted"><use xlink:href="#icon-muted"></use></svg>
--- a/gulpfile.js
+++ b/gulpfile.js
@ -22,7 +22,8 @@ var fs 			= require("fs"),
    s3          = require("gulp-s3"),
    gzip        = require("gulp-gzip"),
    replace     = require("gulp-replace"),
-	open 		= require("gulp-open");
+    open        = require("gulp-open"),
+    size        = require("gulp-size");

 var root = __dirname,
 paths = {
@ -223,6 +224,10 @@ gulp.task("cdn", function () {

    // Upload to CDN 
    gulp.src(paths.upload)
+        .pipe(size({
+            showFiles: true,
+            gzip: true
+        }))
        .pipe(rename(function (path) {
            path.dirname = path.dirname.replace(".", version);
        }))
@ -234,6 +239,11 @@ gulp.task("cdn", function () {
 gulp.task("docs", function () {
    console.log("Uploading " + version + " docs to " + aws.docs.bucket);

+    // Replace versioned files in readme.md
+    gulp.src([root + "/readme.md"])
+        .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
+        .pipe(gulp.dest(root));
+
    // Replace versioned files in *.html
    gulp.src([paths.docs.root + "*.html"])
        .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "plyr",
-  "version": "1.0.24",
+  "version": "1.0.27",
  "description": "A simple HTML5 media player using custom controls",
  "homepage": "http://plyr.io",
  "main": "gulpfile.js",
@ -18,6 +18,7 @@
    "gulp-replace": "^0.5.3",
    "gulp-s3": "^0.3.0",
    "gulp-sass": "^1.3.3",
+    "gulp-size": "^1.2.1",
    "gulp-svgmin": "^1.0.0",
    "gulp-svgstore": "^5.0.0",
    "gulp-uglify": "~0.3.1",
--- a/readme.md
+++ b/readme.md
@ -38,7 +38,7 @@ If you have any cool ideas or features, please let me know by [creating an issue

 Check `docs/index.html` and `docs/dist/docs.js` for an example setup. 

-**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.0.24/plyr.js` to `https://cdn.plyr.io/1.0.24/plyr.js`
+**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.0.27/plyr.js` to `https://cdn.plyr.io/1.0.27/plyr.js`

 ### Bower
 If bower is your thang, you can grab Plyr using:
@ -51,11 +51,11 @@ More info on setting up dependencies can be found in the [Bower Docs](http://bow
 If you want to use our CDN, you can use the following. HTTPS (SSL) is supported.

 ```html
-<link rel="stylesheet" href="//cdn.plyr.io/1.0.24/plyr.css">
-<script src="//cdn.plyr.io/1.0.24/plyr.js"></script>
+<link rel="stylesheet" href="//cdn.plyr.io/1.0.27/plyr.css">
+<script src="//cdn.plyr.io/1.0.27/plyr.js"></script>
 ```

-You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.24/sprite.svg`.
+You can also access the `sprite.svg` file at `//cdn.plyr.io/1.0.27/sprite.svg`.

 ### CSS
 If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. 
@ -365,7 +365,7 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt
  </tbody>
 </table>

-&sup1; iPhone forces the native player for `<video>` so no customisation possible
+&sup1; iPhone forces the native player for `<video>` so no customisation possible. `<audio>` elements have volume controls disabled.

 &sup2; Native player used (no support for `<progress>` or `<input type="range">`)

--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@ -1,7 +1,7 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.0.24
-// https://github.com/sampotts/plyr
+// plyr.js v1.0.27
+// https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
 // Credits: http://paypal.github.io/accessible-html5-video-player/
@ -88,7 +88,7 @@
                            "<span>0</span>% buffered",
                        "</progress>",
                    "</div>",
-                    "<span class='player-controls-playback'>",
+                    "<span class='player-controls-left'>",
                        "<button type='button' data-player='restart'>",
                            "<svg><use xlink:href='#icon-restart'></use></svg>",
                            "<span class='sr-only'>Restart</span>",
@ -114,7 +114,7 @@
                            "<span class='player-duration'>00:00</span>",
                        "</span>",
                    "</span>",
-                    "<span class='player-controls-sound'>",
+                    "<span class='player-controls-right'>",
                        "<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>",
                        "<label id='mute{id}' for='mute{id}'>",
                            "<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>",
@ -151,7 +151,7 @@
    // Unfortunately, due to mixed support, UA sniffing is required
    function _browserSniff() {
        var nAgt = navigator.userAgent,
-            browserName = navigator.appName,
+            name = navigator.appName,
            fullVersion = ""+parseFloat(navigator.appVersion),
            majorVersion = parseInt(navigator.appVersion,10),
            nameOffset,
@ -160,22 +160,22 @@

        // MSIE 11
        if ((navigator.appVersion.indexOf("Windows NT") !== -1) && (navigator.appVersion.indexOf("rv:11") !== -1)) {
-            browserName = "IE";
+            name = "IE";
            fullVersion = "11;";
        }
        // MSIE
        else if ((verOffset=nAgt.indexOf("MSIE")) !== -1) {
-            browserName = "IE";
+            name = "IE";
            fullVersion = nAgt.substring(verOffset+5);
        }
        // Chrome
        else if ((verOffset=nAgt.indexOf("Chrome")) !== -1) {
-            browserName = "Chrome";
+            name = "Chrome";
            fullVersion = nAgt.substring(verOffset+7);
        }
        // Safari
        else if ((verOffset=nAgt.indexOf("Safari")) !== -1) {
-            browserName = "Safari";
+            name = "Safari";
            fullVersion = nAgt.substring(verOffset+7);
            if ((verOffset=nAgt.indexOf("Version")) !== -1) {
                fullVersion = nAgt.substring(verOffset+8);
@ -183,15 +183,15 @@
        }
        // Firefox
        else if ((verOffset=nAgt.indexOf("Firefox")) !== -1) {
-            browserName = "Firefox";
+            name = "Firefox";
            fullVersion = nAgt.substring(verOffset+8);
        }
        // In most other browsers, "name/version" is at the end of userAgent 
        else if ( (nameOffset=nAgt.lastIndexOf(" ")+1) < (verOffset=nAgt.lastIndexOf("/")) ) {
-            browserName = nAgt.substring(nameOffset,verOffset);
+            name = nAgt.substring(nameOffset,verOffset);
            fullVersion = nAgt.substring(verOffset+1);
-            if (browserName.toLowerCase()==browserName.toUpperCase()) {
-                browserName = navigator.appName;
+            if (name.toLowerCase()==name.toUpperCase()) {
+                name = navigator.appName;
            }
        }
        // Trim the fullVersion string at semicolon/space if present
@ -207,8 +207,13 @@
            fullVersion = ""+parseFloat(navigator.appVersion); 
            majorVersion = parseInt(navigator.appVersion,10);
        }
+
        // Return data
-        return [browserName, majorVersion];
+        return {
+            name:       name, 
+            version:    majorVersion, 
+            ios:        /(iPad|iPhone|iPod)/g.test(navigator.platform)
+        };
    }

    // Check for mime type support against a player instance
@ -312,6 +317,17 @@
    function _toggleHandler(element, events, callback, toggle) {
        events = events.split(" ");

+        // If a nodelist is passed, call itself on each node
+        if(element instanceof NodeList) {
+            for (var x = 0; x < element.length; x++) {
+                if (element[x] instanceof Node) {
+                    _toggleHandler(element[x], arguments[1], arguments[2], arguments[3]);
+                }
+            }
+            return;
+        }
+
+        // If a single node is passed, bind the event listener
        for (var i = 0; i < events.length; i++) {
            element[toggle ? "addEventListener" : "removeEventListener"](events[i], callback, false);
        }
@ -327,6 +343,35 @@
        _toggleHandler(element, events, callback, false);
    }

+    // Trigger event
+    function _triggerEvent(element, event) {
+        // Create faux event
+        var fauxEvent = document.createEvent("MouseEvents");
+
+        // Set the event type
+        fauxEvent.initEvent(event, true, true);
+
+        // Dispatch the event
+        element.dispatchEvent(fauxEvent);
+    }
+
+    // Toggle checkbox
+    function _toggleCheckbox(event) {
+        // Only listen for return key
+        if(event.keyCode && event.keyCode != 13) {
+            return true;
+        }
+
+        // Toggle the checkbox
+        event.target.checked = !event.target.checked;
+
+        // Set the attribute for CSS hooks
+        event.target[event.target.checked ? "setAttribute" : "removeAttribute"]("checked", "");
+
+        // Trigger change event
+        _triggerEvent(event.target, "change");
+    }
+
    // Get percentage
    function _getPercentage(current, max) {
        if(current === 0 || max === 0 || isNaN(current) || isNaN(max)) {
@ -491,7 +536,7 @@

            if (config.captions.defaultActive) {
                _toggleClass(player.container, config.classes.captions.active, true);
-                player.buttons.captions.setAttribute("checked", "checked");
+                player.buttons.captions.setAttribute("checked", "");
            }
        }

@ -585,9 +630,12 @@
                player.buttons.restart          = _getElement(config.selectors.buttons.restart);
                player.buttons.rewind           = _getElement(config.selectors.buttons.rewind);
                player.buttons.forward          = _getElement(config.selectors.buttons.forward);
+                player.buttons.fullscreen       = _getElement(config.selectors.buttons.fullscreen);
+
+                // Inputs
                player.buttons.mute             = _getElement(config.selectors.buttons.mute);
                player.buttons.captions         = _getElement(config.selectors.buttons.captions);
-                player.buttons.fullscreen       = _getElement(config.selectors.buttons.fullscreen);
+                player.checkboxes               = _getElements("[type='checkbox']");

                // Progress
                player.progress = {};
@ -614,6 +662,7 @@
            }
            catch(e) {
                _log("It looks like there's a problem with your controls html. Bailing.", true);
+
                return false;
            }
        }
@ -644,7 +693,7 @@
            player.media.removeAttribute("controls");

            // Set media type
-            player.type = (player.media.tagName == "VIDEO" ? "video" : "audio");
+            player.type = player.media.tagName.toLowerCase();

            // Add type class
            _toggleClass(player.container, config.classes[player.type], true);
@ -652,6 +701,11 @@
            // If there's no autoplay attribute, assume the video is stopped and add state class
            _toggleClass(player.container, config.classes.stopped, (player.media.getAttribute("autoplay") === null));

+            // Add iOS class
+            if(player.browser.ios) {
+                _toggleClass(player.container, "ios", true);
+            }
+
            // Inject the player wrapper
            if(player.type === "video") {
                // Create the wrapper div
@ -727,10 +781,10 @@
                    _showCaptions(player);

                    // If IE 10/11 or Firefox 31+ or Safari 7+, don"t use native captioning (still doesn"t work although they claim it"s now supported)
-                    if ((player.browserName === "IE" && player.browserMajorVersion === 10) || 
-                            (player.browserName === "IE" && player.browserMajorVersion === 11) || 
-                            (player.browserName === "Firefox" && player.browserMajorVersion >= 31) || 
-                            (player.browserName === "Safari" && player.browserMajorVersion >= 7)) {
+                    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 === "Safari" && player.browser.version >= 7)) {
                        // Debugging
                        _log("Detected IE 10/11 or Firefox 31+ or Safari 7+.");

@ -802,7 +856,7 @@
                    }

                    // If Safari 7+, removing track from DOM [see "turn off native caption rendering" above]
-                    if (player.browserName === "Safari" && player.browserMajorVersion >= 7) {
+                    if (player.browser.name === "Safari" && player.browser.version >= 7) {
                        _log("Safari 7+ detected; removing track from DOM.");

                        // Find all <track> elements
@ -888,7 +942,11 @@
            }

            // Set the current time
+            // Try/catch incase the media isn't set and we're calling seek() from source() and IE moans
+            try {
                player.media.currentTime = targetTime.toFixed(1);
+            }
+            catch(e) {}

            // Logging
            _log("Seeking to " + player.media.currentTime + " seconds");
@ -1214,22 +1272,6 @@
            // Handle user exiting fullscreen by escaping etc
            _on(document, fullscreen.fullScreenEventName, _toggleFullscreen);
            
-            // Click video
-            if(player.type === "video" && config.click) {
-                _on(player.videoContainer, "click", function() {
-                    if(player.media.paused) {
-                        _play();
-                    }
-                    else if(player.media.ended) {
-                        _seek();
-                        _play();
-                    }
-                    else {
-                        _pause();
-                    }
-                });
-            }
-            
            // Time change on media
            _on(player.media, "timeupdate seeking", _timeUpdate);

@ -1240,15 +1282,18 @@
            _on(player.buttons.seek, "change input", _seek);

            // Captions
-            _on(player.buttons.captions, "click", function() { 
+            _on(player.buttons.captions, "change", function() { 
                _toggleCaptions(this.checked);
            });

-            // Clear captions at end of video
+            // Handle the media finishing
            _on(player.media, "ended", function() {
+                // Clear 
                if(player.type === "video") {
                    player.captionsContainer.innerHTML = "";
                }
+
+                // Reset UI
                _checkPlaying();
            });

@ -1266,6 +1311,25 @@

            // Loading
            _on(player.media, "waiting canplay seeked", _checkLoading);
+
+            // Toggle checkboxes on return key (as they look like buttons)
+            _on(player.checkboxes, "keyup", _toggleCheckbox);
+
+            // Click video
+            if(player.type === "video" && config.click) {
+                _on(player.videoContainer, "click", function() {
+                    if(player.media.paused) {
+                        _play();
+                    }
+                    else if(player.media.ended) {
+                        _seek();
+                        _play();
+                    }
+                    else {
+                        _pause();
+                    }
+                });
+            }
        }

        function _init() {
@ -1273,16 +1337,14 @@
            fullscreen = _fullscreen();

            // Sniff 
-            player.browserInfo = _browserSniff();
-            player.browserName = player.browserInfo[0];
-            player.browserMajorVersion = player.browserInfo[1];
+            player.browser = _browserSniff();

            // Debug info
-            _log(player.browserName + " " + player.browserMajorVersion);
+            _log(player.browser.name + " " + player.browser.version);

            // If IE8, stop customization (use fallback)
            // If IE9, stop customization (use native controls)
-            if (player.browserName === "IE" && (player.browserMajorVersion === 8 || player.browserMajorVersion === 9) ) {
+            if (player.browser.name === "IE" && (player.browser.version === 8 || player.browser.version === 9) ) {
                _log("Browser not suppported.", true);
                return false;
            }
@ -1315,9 +1377,14 @@

            // Listeners
            _listeners();
+
+            // Successful setup
+            return true;
        }

-        _init();
+        if(!_init()) {
+            return {};
+        }

        return {
            media:              player.media,
@ -1348,7 +1415,8 @@
        }

        // Get the players 
-        var elements = document.querySelectorAll(config.selectors.container), players = [];
+        var elements    = document.querySelectorAll(config.selectors.container), 
+            players     = [];

        // Create a player instance for each element
        for (var i = elements.length - 1; i >= 0; i--) {
@ -1357,14 +1425,18 @@

            // Disabled for <video> for iPhone
            // Since it doesn't allow customisation
-            if (element.querySelectorAll("audio, video")[0].tagName === "VIDEO" 
+            if (element.querySelectorAll("audio, video")[0].tagName.toLowerCase() === "video"
                && /iPhone/i.test(navigator.userAgent)) {
                continue;
            }

            // Setup a player instance and add to the element
            if(typeof element.plyr === "undefined") { 
-                element.plyr = new Plyr(element);
+                // Create new instance
+                var instance = new Plyr(element);
+
+                // Set plyr to false if setup failed
+                element.plyr = (Object.keys(instance).length ? instance : false);
            }

            // Add to return array
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@ -185,15 +185,15 @@
        text-align: center;

        // Layout
-		&-sound {
+        &-right {
            display: block;
            margin: @control-spacing auto 0;
        }
        @media (min-width: @bp-control-split) {
-			&-playback {
+            &-left {
                float: left;
            }
-			&-sound {
+            &-right {
                float: right;
                margin-top: 0;
            }
@ -497,6 +497,20 @@
        }
    }

+    // Hide sound controls on iOS
+    // It's not supported to change volume using JavaScript:
+    // https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/Using_HTML5_Audio_Video/Device-SpecificConsiderations/Device-SpecificConsiderations.html
+    &.ios &-volume,
+    &.ios [data-player='mute'],
+    &.ios [data-player='mute'] + label,
+    &-audio.ios &-controls-right {
+        display: none;
+    }
+    // Center buttons so it looks less odd
+    &-audio.ios &-controls-left {
+        float: none;
+    }
+
    // Full screen mode
    &-fullscreen,
    &.fullscreen-active {
@ -510,13 +524,13 @@
        z-index: 10000000;
        background: #000;

+        video {
+            height: 100%;
+        }
        .player-video-wrapper {
            height: 100%;
            width: 100%;

-			video {
-				height: 100%;
-			}
            .player-captions {
                top: auto;
                bottom: 90px;
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@ -37,7 +37,7 @@ $progress-buffered-bg: 		$gray;
 $progress-loading-size:   40px;
 $progress-loading-bg:     rgba(0,0,0, .15);

-// Range
+// Volume
 $volume-track-height:     6px;
 $volume-track-bg:         $gray;
 $volume-thumb-height:     ($volume-track-height * 2);
@ -79,7 +79,7 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 // Animation
 // ---------------------------------------
@keyframes progress {
-	to { background-position: @progress-loading-size 0; }
+    to { background-position: $progress-loading-size 0; }
 }

 // <input type="range"> styling
@ -101,28 +101,30 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
    border: 0;
    border-radius: ($volume-track-height / 2);
 }
-@mixin seek-thumb() {
+@mixin seek-thumb()
+{
    background: transparent;
    border: 0;
    width: ($control-spacing * 2);
    height: $control-spacing;
 }
-@mixin seek-track() {
+@mixin seek-track()
+{
    background: none;
    border: 0;
 }

 // Font smoothing
 // ---------------------------------------
-@mixin font-smoothing($mode: on) when ($mode = on)
+@mixin font-smoothing($mode: on)
 {
+    @if $mode == 'on' {
        -moz-osx-font-smoothing: grayscale;
        -webkit-font-smoothing: antialiased;
-}
-@mixin font-smoothing($mode: on) when ($mode = off)
-{
+    } @else if $mode == 'off' {
        -moz-osx-font-smoothing: auto;
        -webkit-font-smoothing: subpixel-antialiased;
+    }
 }

 // Styles
@ -191,15 +193,15 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
        text-align: center;

        // Layout
-		&-sound {
+        &-right {
            display: block;
            margin: $control-spacing auto 0;
        }
        @media (min-width: $bp-control-split) {
-			&-playback {
+            &-left {
                float: left;
            }
-			&-sound {
+            &-right {
                float: right;
                margin-top: 0;
            }
@ -238,16 +240,19 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
            background: transparent;
            overflow: hidden;
        }
-		input:focus + label,
-		button:focus {
-			@include tab-focus();
-			color: $control-color-focus;
-		}
+
+        // Specificity for overriding .inverted
+        button:focus,
        button:hover,
-		input + label:hover {
+        [type="checkbox"]:focus + label,
+        [type="checkbox"] + label:hover {
            background: $control-bg-hover;
            color: $control-color-hover;
        }
+        button:focus,
+        input:focus + label {
+            outline: 0;
+        }
        .icon-exit-fullscreen,
        .icon-muted,
        .icon-captions-on {
@ -330,8 +335,9 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
            left: 0;
            top: 0;
            width: 100%;
-			height: 100%;
+            height: $control-spacing;
            margin: 0;
+            padding: 0;
            vertical-align: top;

            -webkit-appearance: none;
@ -339,7 +345,6 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
            border: none;
            background: transparent;
        }
-
        &-buffer[value],
        &-played[value] {
            &::-webkit-progress-bar {
@ -366,7 +371,7 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
        // <input[type='range']> element
        // Specificity is for bootstrap compatibility
        &-seek[type=range] {
-			z-index: 3;
+            z-index: 4;
            cursor: pointer;
            outline: 0;

@ -441,6 +446,7 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
    // <input[type='range']> element
    // Specificity is for bootstrap compatibility
    &-volume[type=range] {
+        display: inline-block;
        vertical-align: middle;
        -webkit-appearance: none;
        -moz-appearance: none;
@ -452,20 +458,20 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size

        // Webkit
        &::-webkit-slider-runnable-track {
-			@include range-track();
+            @include volume-track();
        }
        &::-webkit-slider-thumb {
            -webkit-appearance: none;
            margin-top: -(($volume-thumb-height - $volume-track-height) / 2);
-			@include range-thumb();
+            @include volume-thumb();
        }

        // Mozilla
        &::-moz-range-track {
-			@include range-track();
+            @include volume-track();
        }
        &::-moz-range-thumb {
-			@include range-thumb();
+            @include volume-thumb();
        }

        // Microsoft
@ -478,10 +484,10 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
        }
        &::-ms-fill-lower,
        &::-ms-fill-upper {
-			@include range-track();
+            @include volume-track();
        }
        &::-ms-thumb {
-			@include range-thumb();
+            @include volume-thumb();
        }

        &:focus {
@ -499,6 +505,20 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
        }
    }

+    // Hide sound controls on iOS
+    // It's not supported to change volume using JavaScript:
+    // https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/Using_HTML5_Audio_Video/Device-SpecificConsiderations/Device-SpecificConsiderations.html
+    &.ios &-volume,
+    &.ios [data-player='mute'],
+    &.ios [data-player='mute'] + label,
+    &-audio.ios &-controls-right {
+        display: none;
+    }
+    // Center buttons so it looks less odd
+    &-audio.ios &-controls-left {
+        float: none;
+    }
+
    // Full screen mode
    &-fullscreen,
    &.fullscreen-active {
@ -512,13 +532,13 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
        z-index: 10000000;
        background: #000;

+        video {
+            height: 100%;
+        }
        .player-video-wrapper {
            height: 100%;
            width: 100%;

-			video {
-				height: 100%;
-			}
            .player-captions {
                top: auto;
                bottom: 90px;
Author	SHA1	Message	Date
Sam Potts	388cb4df39	Keyboard accessibility improvements (Fixes #66 ) - Enter now works on checkboxes within the controls	2015-03-21 17:00:05 +11:00
Sam Potts	9feffb2972	Version bump	2015-03-15 10:18:56 +11:00
Sam Potts	acea5cdb24	Built js	2015-03-15 10:14:00 +11:00
Sam Potts	55ed577b6a	Indentation Converted to 4 space width tabbing	2015-03-15 10:12:36 +11:00
Sam Potts	20b206a161	Merge pull request #62 from brunowego/patch-1 Updated SASS support	2015-03-15 10:00:00 +11:00
Bruno Wego	9c028a0ecc	Updated SASS support	2015-03-14 15:50:32 -03:00
Sam Potts	b677c3d7ad	Merge branch 'master' of https://github.com/selz/plyr Conflicts: dist/plyr.js src/js/plyr.js	2015-03-10 23:57:36 +11:00
Sam Potts	aa6bc2df2f	Fixes for volume control on iOS	2015-03-10 23:54:52 +11:00
Sam Potts	a16579fd21	Fix for repo url	2015-03-09 11:53:26 +11:00
Sam Potts	ae5a816df1	Fix for potential issue with .tagName	2015-03-09 11:51:01 +11:00