From 9827e6a0bcded89862166ae2ca75fad7ec0aed69 Mon Sep 17 00:00:00 2001
From: Sam Potts <me@sampotts.me>
Date: Tue, 17 Feb 2015 18:44:31 +1100
Subject: [PATCH] Prevent buttons submitting forms, return players

---
 assets/js/plyr.js              |  7 ++++++-
 assets/templates/controls.html | 12 ++++++------
 index.html                     |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/assets/js/plyr.js b/assets/js/plyr.js
index 75a4cace..c594b36c 100644
--- a/assets/js/plyr.js
+++ b/assets/js/plyr.js
@@ -955,7 +955,7 @@
 		}
 
 		// Get the players 
-		var elements = document.querySelectorAll(config.selectors.container);
+		var elements = document.querySelectorAll(config.selectors.container), players = [];
 
 		// Create a player instance for each element
 		for (var i = elements.length - 1; i >= 0; i--) {
@@ -964,6 +964,11 @@
 			
 			// Setup a player instance and add to the element
 			element.plyr = new Plyr(element);
+
+			// Add to return array
+			players.push(element.plyr);
 		}
+
+		return players;
 	}
 }(this.plyr = this.plyr || {}));
\ No newline at end of file
diff --git a/assets/templates/controls.html b/assets/templates/controls.html
index e6582f47..de36ed61 100644
--- a/assets/templates/controls.html
+++ b/assets/templates/controls.html
@@ -3,23 +3,23 @@
 		<span>0</span>% played
 	</progress>
 	<span class="player-controls-playback">
-		<button data-player="restart">
+		<button type="button" data-player="restart">
 			<svg><use xlink:href="#icon-refresh"></use></svg>
 			<span class="sr-only">Restart</span>
 		</button>
-		<button data-player="rewind">
+		<button type="button" data-player="rewind">
 			<svg><use xlink:href="#icon-rewind"></use></svg>
 			<span class="sr-only">Rewind <span class="player-seek-time">10</span> seconds</span>
 		</button>
-		<button aria-label="{aria-label}" data-player="play">
+		<button type="button" aria-label="{aria-label}" data-player="play">
 			<svg><use xlink:href="#icon-play"></use></svg>
 			<span class="sr-only">Play</span>
 		</button>
-		<button data-player="pause">
+		<button type="button" data-player="pause">
 			<svg><use xlink:href="#icon-pause"></use></svg>
 			<span class="sr-only">Pause</span>
 		</button>
-		<button data-player="fast-forward">
+		<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">10</span> seconds</span>
 		</button>
@@ -45,7 +45,7 @@
 			<span class="sr-only">Captions</span>
 		</label>
 
-		<button data-player="fullscreen">
+		<button type="button" data-player="fullscreen">
 			<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>
diff --git a/index.html b/index.html
index 1083e516..b20f61fd 100644
--- a/index.html
+++ b/index.html
@@ -26,7 +26,7 @@
 					<source src="//cdn.sampotts.me/plyr/movie.webm" type="video/webm">
 					
 					<!-- Text track file -->
-					<track kind="captions" label="English captions" src="//cdn.sampotts.me/plyr/movie_captions_en.vtt" srclang="en" default>
+					<track kind="captions" label="English captions" src="//cdn.sampotts.me/plyr/movie_captions.vtt" srclang="en" default>
 					
 					<!-- Fallback for browsers that don't support the <video> element -->
 					<div>