Aria tidy up

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "plyr",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "A simple HTML5 media player using custom controls",
   "homepage": "http://plyr.io",
   "keywords": [

changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v1.0.16
+- Aria label is now dynamic
+
 ## v1.0.15
 - Fix for seek time display in controls
 - More documentation for controls html

controls.md

@@ -1,16 +1,17 @@
 # Controls HTML
 
-This is the markup that is rendered for controls. It is a seperate option to allow full customisation of markup based on your needs. The default Plyr setup uses a Hogan template, this is to allow for localisation at a later date. If you check `controls.html` in `/src/templates` to get an idea of how the default html works.
+This is the markup that is rendered for the Plyr controls. The reason it's a seperate option is to allow full customization of markup based on your needs. It's a pet hate of other libraries that use `<a href="#">` or `<span>`s as buttons! 
+
+The default Plyr setup uses a Hogan template. The reason being to allow for localization at a later date. Check out `controls.html` in `/src/templates` to get an idea of how the default html is structured. Alternatively just use the vanilla HTML below.
 
 ## Requirements
 
 The classes and data attributes used in your template should match the `selectors` option. 
 
-You need to add two placeholders to your html template:
+You need to add several placeholders to your html template that are replaced when rendering:
 
-- {id} for the dynamically generated ID for the player (for form controls)
-- {aria-label} for the dynamically generated play button label for screen readers
-- {seek-time} for the seek time specified in options for fast forward and rewind
+- `{id}` - the dynamically generated ID for the player (for form controls)
+- `{seektime}` - the seek time specified in options for fast forward and rewind
 
 Currently all buttons and inputs need to be present for Plyr to work but later we'll make it more dynamic so if you omit a button or input, it'll still work. 
 
@@ -18,7 +19,7 @@ Currently all buttons and inputs need to be present for Plyr to work but later w
 
 You can of course, just specify vanilla HTML. Here's an example snippet:
 
-```javascript
+```html
 var controls = [
 '<div class="player-controls">',
 	'<div class="player-progress">',
@@ -31,24 +32,24 @@ var controls = [
 	'</div>',
 	'<span class="player-controls-playback">',
 		'<button type="button" data-player="restart">',
-			'<span class="icon-restart" aria-hidden="true"></span>',
+			'<svg><use xlink:href="#icon-refresh"></use></svg>',
 			'<span class="sr-only">Restart</span>',
 		'</button>',
 		'<button type="button" data-player="rewind">',
-			'<span class="icon-rewind" aria-hidden="true"></span>',
-			'<span class="sr-only">Rewind <span class="player-seek-time">{seek_time}</span> seconds</span>',
+			'<svg><use xlink:href="#icon-rewind"></use></svg>',
+			'<span class="sr-only">Rewind <span class="player-seek-time">{seektime}</span> seconds</span>',
 		'</button>',
-		'<button type="button" aria-label="{aria-label}" data-player="play">',
-			'<span class="icon-play" aria-hidden="true"></span>',
+		'<button type="button" data-player="play">',
+			'<svg><use xlink:href="#icon-play"></use></svg>',
 			'<span class="sr-only">Play</span>',
 		'</button>',
 		'<button type="button" data-player="pause">',
-			'<span class="icon-pause" aria-hidden="true"></span>',
+			'<svg><use xlink:href="#icon-pause"></use></svg>',
 			'<span class="sr-only">Pause</span>',
 		'</button>',
 		'<button type="button" data-player="fast-forward">',
-			'<span class="icon-forward" aria-hidden="true"></span>',
-			'<span class="sr-only">Fast forward <span class="player-seek-time">{seek_time}</span> seconds</span>',
+			'<svg><use xlink:href="#icon-fast-forward"></use></svg>',
+			'<span class="sr-only">Fast forward <span class="player-seek-time">{seektime}</span> seconds</span>',
 		'</button>',
 		'<span class="player-time">',
 			'<span class="sr-only">Time</span>',
@@ -58,20 +59,20 @@ var controls = [
 	'<span class="player-controls-sound">',
 		'<input class="inverted sr-only" id="mute{id}" type="checkbox" data-player="mute">',
 		'<label id="mute{id}" for="mute{id}">',
-			'<span class="icon-mute icon-muted" aria-hidden="true"></span>',
-			'<span class="icon-volume-up" aria-hidden="true"></span>',
+			'<svg class="icon-muted"><use xlink:href="#icon-muted"></use></svg>',
+			'<svg><use xlink:href="#icon-sound"></use></svg>',
 			'<span class="sr-only">Mute</span>',
 		'</label>',
-		'<label for="volume{id}" class="sr-only">Volume:</label>',
+		'<label for="volume{id}" class="sr-only">Volume</label>',
 		'<input id="volume{id}" class="player-volume" type="range" min="0" max="10" value="5" data-player="volume">',
 		'<input class="sr-only" id="captions{id}" type="checkbox" data-player="captions">',
 		'<label for="captions{id}">',
-			'<span class="icon-subtitles" aria-hidden="true"></span>',
+			'<svg><use xlink:href="#icon-bubble"></use></svg>',
 			'<span class="sr-only">Captions</span>',
 		'</label>',
 		'<button type="button" data-player="fullscreen">',
-			'<span class="icon-resize-small icon-exit-fullscreen" aria-hidden="true"></span>',
-			'<span class="icon-resize-full" aria-hidden="true"></span>',
+			'<svg class="icon-exit-fullscreen"><use xlink:href="#icon-collapse"></use></svg>',
+			'<svg><use xlink:href="#icon-expand"></use></svg>',
 			'<span class="sr-only">Toggle fullscreen</span>',
 		'</button>',
 	'</span>',

dist/js/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("		<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-refresh\"></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 <span class=\"player-seek-time\">{seek-time}</span> seconds</span>");t.b("\n" + i);t.b("		</button>");t.b("\n" + i);t.b("		<button type=\"button\" aria-label=\"{aria-label}\" 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\">Fast forward <span class=\"player-seek-time\">{seek-time}</span> seconds</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-sound\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">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\" value=\"5\" 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><use xlink:href=\"#icon-bubble\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">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-collapse\"></use></svg>");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-expand\"></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("		<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-refresh\"></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 <span class=\"player-seek-time\">{seektime}</span> seconds</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\">Fast forward <span class=\"player-seek-time\">{seektime}</span> seconds</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-sound\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">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\" value=\"5\" 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><use xlink:href=\"#icon-bubble\"></use></svg>");t.b("\n" + i);t.b("			<span class=\"sr-only\">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-collapse\"></use></svg>");t.b("\n" + i);t.b("			<svg><use xlink:href=\"#icon-expand\"></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: {  }});

index.html

@@ -70,15 +70,5 @@
 
 		<!-- Docs setup -->
 		<script src="dist/js/docs.js"></script>
-
-		<!-- GA -->
-		<script>
-		(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-		ga('create', 'UA-40881672-11', 'auto');
-		ga('send', 'pageview');
-		</script>
 	</body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plyr",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "A simple HTML5 media player using custom controls",
   "homepage": "http://plyr.io",
   "main": "gulpfile.js",

readme.md

@@ -144,7 +144,7 @@ plyr.setup({
     <td><code>html</code></td>
     <td>String</td>
     <td><code>&mdash;</code></td>
-    <td>This is **required**. See [controls.md](controls.md) for more info on how the html needs to be structured.</td>
+    <td>This is **required**. See <a href="controls.md">controls.md</a> for more info on how the html needs to be structured.</td>
   </tr>
   <tr>
     <td><code>debug</code></td>
@@ -290,6 +290,7 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt
       <td>Safari</td>
       <td>Firefox</td>
       <td>Chrome</td>
+      <td>Opera</td>
       <td>IE9</td>
       <td>IE10+</td>
     </tr>
@@ -299,6 +300,7 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt
       <td>✔</td>
       <td>✔</td>
       <td>✔</td>
+      <td>✔</td>
       <td>✖&sup1;</td>
       <td>✔&sup2;</td>
     </tr>
@@ -306,6 +308,7 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt
 </table>
 
 &sup1; Native player used (no support for `<progress>` or `<input type="range">`)
+
 &sup2; IE10 has no native fullscreen support, fallback can be used (see options)
 
 The `enabled` option can be used to disable certain User Agents. For example, if you don't want to use Plyr for smartphones, you could use: 

src/js/docs.js

@@ -12,4 +12,15 @@ plyr.setup({
 	captions: {
 		defaultActive: true
 	}
-});
+});
+
+// Google analytics 
+// For demo site (http://plyr.io) only
+if(document.domain === "plyr.io") {
+	(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,"script","//www.google-analytics.com/analytics.js","ga");
+	ga("create", "UA-40881672-11", "auto");
+	ga("send", "pageview");
+}

src/js/plyr.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.0.15
+// plyr.js v1.0.16
 // https://github.com/sampotts/plyr
 // ==========================================================================
 // Credits: http://paypal.github.io/accessible-html5-video-player/
@@ -432,11 +432,8 @@
             // Need to do a default?
             var html = config.html;
 
-            // Replace aria label instances
-            html = _replaceAll(html, "{aria-label}", config.playAriaLabel);
-
             // Replace seek time instances
-            html = _replaceAll(html, "{seek-time}", config.seekTime);
+            html = _replaceAll(html, "{seektime}", config.seekTime);
 
             // Replace all id references
             html = _replaceAll(html, "{id}", player.random);
@@ -490,6 +487,18 @@
             }
         }
 
+        // Setup aria attributes
+        function _setupAria() {
+            var label = player.buttons.play.innerText;
+
+            // If there's a media title set, use that for the label
+            if (typeof(config.title) !== "undefined" && config.title.length) {
+                label = player.buttons.play.innerText + ", " + config.title;
+            }
+
+            player.buttons.play.setAttribute("aria-label", label);
+        }
+
         // Setup media
         function _setupMedia() {
             player.media = player.container.querySelectorAll("audio, video")[0];
@@ -1058,14 +1067,6 @@
                 return false;
             }
 
-            // Set up aria-label for Play button with the title option
-            if (typeof(config.title) === "undefined" || !config.title.length) {
-                config.playAriaLabel = "Play";
-            }
-            else {
-                config.playAriaLabel = "Play " + config.title;
-            }
-
             // Setup media
             _setupMedia();
 
@@ -1080,6 +1081,9 @@
                 return false;
             }
 
+            // Set up aria-label for Play button with the title option
+            _setupAria();
+
             // Captions
             _setupCaptions();
 

src/templates/controls.html

@@ -14,9 +14,9 @@
 		</button>
 		<button type="button" data-player="rewind">
 			<svg><use xlink:href="#icon-rewind"></use></svg>
-			<span class="sr-only">Rewind <span class="player-seek-time">{seek-time}</span> seconds</span>
+			<span class="sr-only">Rewind <span class="player-seek-time">{seektime}</span> seconds</span>
 		</button>
-		<button type="button" aria-label="{aria-label}" data-player="play">
+		<button type="button" data-player="play">
 			<svg><use xlink:href="#icon-play"></use></svg>
 			<span class="sr-only">Play</span>
 		</button>
@@ -26,7 +26,7 @@
 		</button>
 		<button type="button" data-player="fast-forward">
 			<svg><use xlink:href="#icon-fast-forward"></use></svg>
-			<span class="sr-only">Fast forward <span class="player-seek-time">{seek-time}</span> seconds</span>
+			<span class="sr-only">Fast forward <span class="player-seek-time">{seektime}</span> seconds</span>
 		</button>
 		<span class="player-time">
 			<span class="sr-only">Time</span>
@@ -41,7 +41,7 @@
 			<span class="sr-only">Mute</span>
 		</label>
 
-		<label for="volume{id}" class="sr-only">Volume:</label>
+		<label for="volume{id}" class="sr-only">Volume</label>
 		<input id="volume{id}" class="player-volume" type="range" min="0" max="10" value="5" data-player="volume">
 
 		<input class="sr-only" id="captions{id}" type="checkbox" data-player="captions">