diff options
| author | Sam <me@sampotts.me> | 2016-10-01 22:18:40 +1000 |
|---|---|---|
| committer | Sam <me@sampotts.me> | 2016-10-01 22:18:40 +1000 |
| commit | 613c45ede9385ef687ad986264f01b49ec9c4f22 (patch) | |
| tree | 93c7ad069d1c6d8002ca06bd1180138d82b2ff05 /src/js/plyr.js | |
| parent | 8743c6a08d68ef0648ad0a4a59b3dc2b4dcf2e7c (diff) | |
| parent | 8098be6f935b153c28e2979bdfbabc1397bfd769 (diff) | |
| download | plyr-613c45ede9385ef687ad986264f01b49ec9c4f22.tar.lz plyr-613c45ede9385ef687ad986264f01b49ec9c4f22.tar.xz plyr-613c45ede9385ef687ad986264f01b49ec9c4f22.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'src/js/plyr.js')
| -rw-r--r-- | src/js/plyr.js | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index cdd23927..2ce6cd3b 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1151,15 +1151,26 @@ var captions = [], caption, req = xhr.responseText; - - captions = req.split('\n\n'); + + //According to webvtt spec, line terminator consists of one of the following + // CRLF (U+000D U+000A), LF (U+000A) or CR (U+000D) + var lineSeparator = '\r\n'; + if(req.indexOf(lineSeparator+lineSeparator) === -1) { + if(req.indexOf('\r\r') !== -1){ + lineSeparator = '\r'; + } else { + lineSeparator = '\n'; + } + } + + captions = req.split(lineSeparator+lineSeparator); for (var r = 0; r < captions.length; r++) { caption = captions[r]; plyr.captions[r] = []; // Get the parts of the captions - var parts = caption.split('\n'), + var parts = caption.split(lineSeparator), index = 0; // Incase caption numbers are added |