diff options
| author | Sam Potts <me@sampotts.me> | 2015-02-17 18:44:31 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-02-17 18:44:31 +1100 |
| commit | 9827e6a0bcded89862166ae2ca75fad7ec0aed69 (patch) | |
| tree | 8d07ed65d72f57560cc31601302bb7e044be3e05 | |
| parent | fc2bb9fcb4c19509035572f5fcc028383e588fc1 (diff) | |
| download | plyr-9827e6a0bcded89862166ae2ca75fad7ec0aed69.tar.lz plyr-9827e6a0bcded89862166ae2ca75fad7ec0aed69.tar.xz plyr-9827e6a0bcded89862166ae2ca75fad7ec0aed69.zip | |
Prevent buttons submitting forms, return players
| -rw-r--r-- | assets/js/plyr.js | 7 | ||||
| -rw-r--r-- | assets/templates/controls.html | 12 | ||||
| -rw-r--r-- | 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> @@ -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> |