From eba083153845a472629d3010bc8e348e34ecc4c9 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 1 Oct 2016 22:07:01 +1000 Subject: [PATCH] Manually merged #385 --- .gitignore | 5 +- demo/error.html | 2 +- demo/index.html | 5 +- .../View_From_A_Blue_Moon_Trailer-HD.en.vtt | 29 +++++++ .../View_From_A_Blue_Moon_Trailer-HD.fr.vtt | 29 +++++++ dist/plyr.js | 4 +- readme.md | 7 +- src/js/plyr.js | 81 ++++++++++++++----- 8 files changed, 134 insertions(+), 28 deletions(-) create mode 100644 demo/webvtt/View_From_A_Blue_Moon_Trailer-HD.en.vtt create mode 100644 demo/webvtt/View_From_A_Blue_Moon_Trailer-HD.fr.vtt diff --git a/.gitignore b/.gitignore index 610716ad..06460b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,6 @@ node_modules *.sublime-workspace .DS_Store aws.json -docs/index.dev.html *.mp4 -index-dev.html +index-*.html notes.txt -*.vtt -docs/index.dev.php diff --git a/demo/error.html b/demo/error.html index f867c915..c9ba8c36 100644 --- a/demo/error.html +++ b/demo/error.html @@ -6,7 +6,7 @@ - +
diff --git a/demo/index.html b/demo/index.html index 0c9b83af..5c9a6166 100644 --- a/demo/index.html +++ b/demo/index.html @@ -51,13 +51,14 @@
-