Skip to content

Commit

Permalink
Fix for manual captions
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Potts committed Feb 21, 2016
1 parent 5b968c9 commit c99f20d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dist/plyr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "1.5.12",
"version": "1.5.13",
"description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "http://plyr.io",
"main": "src/js/plyr.js",
Expand Down
10 changes: 5 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ If you have any cool ideas or features, please let me know by [creating an issue

Check `docs/index.html` and `docs/dist/docs.js` for an example setup.

**Heads up:** the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.5.12/plyr.js` to `https://cdn.plyr.io/1.5.12/plyr.js`
**Heads up:** the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.5.13/plyr.js` to `https://cdn.plyr.io/1.5.13/plyr.js`

### Node Package Manager (NPM)
Using NPM, you can grab Plyr:
Expand Down Expand Up @@ -69,11 +69,11 @@ More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub]
If you want to use our CDN, you can use the following:

```html
<link rel="stylesheet" href="https://cdn.plyr.io/1.5.12/plyr.css">
<script src="https://cdn.plyr.io/1.5.12/plyr.js"></script>
<link rel="stylesheet" href="https://cdn.plyr.io/1.5.13/plyr.css">
<script src="https://cdn.plyr.io/1.5.13/plyr.js"></script>
```

You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.12/sprite.svg`.
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.13/sprite.svg`.

### CSS & Styling
If you want to use the default css, add the `plyr.css` file from `/dist` into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request.
Expand Down Expand Up @@ -170,7 +170,7 @@ More info on CORS here:
Here's an example of a default setup:

```html
<script src="https://cdn.plyr.io/1.5.12/plyr.js"></script>
<script src="https://cdn.plyr.io/1.5.13/plyr.js"></script>
<script>plyr.setup();</script>
```

Expand Down
22 changes: 16 additions & 6 deletions src/js/plyr.js
Original file line number Diff line number Diff line change
Expand Up @@ -914,16 +914,26 @@
xhr.onreadystatechange = function() {
if (xhr.readyState === 4) {
if (xhr.status === 200) {
var records = [],
record,
var captions = [],
caption,
req = xhr.responseText;

records = req.split('\n\n');
captions = req.split('\n\n');

for (var r = 0; r < records.length; r++) {
record = records[r];
for (var r = 0; r < captions.length; r++) {
caption = captions[r];
plyr.captions[r] = [];
plyr.captions[r] = record.split('\n');

// Get the parts of the captions
var parts = caption.split('\n'),
index = 0;

// Incase caption numbers are added
if(parts[index].indexOf(":") === -1) {
index = 1;
}

plyr.captions[r] = [parts[index], parts[index + 1]];
}

// Remove first element ('VTT')
Expand Down

0 comments on commit c99f20d

Please sign in to comment.