ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for omitted kind attribute on <track> (fixes #88)

Browse Source
This commit is contained in:
Sam Potts 2015-07-25 20:45:11 +10:00
parent 06641d5709
commit e0cd34c996
8 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.md
View File

@ -1,5 +1,8 @@
# Changelog
## v1.2.4
- Fix for omitted kind attribute on <track> (fixes #88)
## v1.2.3
- Fix for YouTube on iPhone or unsupported browsers (fallback to YouTube native)
- Docs tidy up

2
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/error.html
View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Docs styles -->
<link rel="stylesheet" href="//cdn.plyr.io/1.2.3/docs.css">
<link rel="stylesheet" href="//cdn.plyr.io/1.2.4/docs.css">
</head>
<body>
<main>

10
docs/index.html
View File

@ -8,10 +8,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Styles -->
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/plyr.css?1">
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/plyr.css?1">
<!-- Docs styles -->
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/docs.css?1">
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/docs.css?1">
</head>
<body>
<header>
@ -97,13 +97,13 @@
b.insertBefore(c, b.childNodes[0]);
}
}
})(document, "https://cdn.plyr.io/1.2.3/sprite.svg");
})(document, "https://cdn.plyr.io/1.2.4/sprite.svg");
</script>
<!-- Plyr core script -->
<script src="https://cdn.plyr.io/1.2.3/plyr.js?1"></script>
<script src="https://cdn.plyr.io/1.2.4/plyr.js?1"></script>
<!-- Docs script -->
<script src="https://cdn.plyr.io/1.2.3/docs.js?1"></script>
<script src="https://cdn.plyr.io/1.2.4/docs.js?1"></script>
</body>
</html>

2
gulpfile.js
View File

@ -167,7 +167,7 @@ build.js(bundles.docs.js, "docs");
// Default gulp task
gulp.task("default", function(){
run("templates", tasks.js, tasks.less, "sprite");
run("templates", tasks.js, tasks.less, "sprite", "watch");
});
// Build all JS (inc. templates)

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "1.2.3",
"version": "1.2.4",
"description": "A simple HTML5 media player using custom controls",
"homepage": "http://plyr.io",
"main": "gulpfile.js",

8
readme.md
View File

@ -39,7 +39,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.2.3/plyr.js` to `https://cdn.plyr.io/1.2.3/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.2.4/plyr.js` to `https://cdn.plyr.io/1.2.4/plyr.js`
### Bower
If bower is your thang, you can grab Plyr using:
@ -59,11 +59,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.2.3/plyr.css">
<script src="https://cdn.plyr.io/1.2.3/plyr.js"></script>
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/plyr.css">
<script src="https://cdn.plyr.io/1.2.4/plyr.js"></script>
```
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.3/sprite.svg`.
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.4/sprite.svg`.
### CSS
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.

8
src/js/plyr.js
View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v1.2.3
// plyr.js v1.2.4
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@ -1028,8 +1028,8 @@
for (var i = 0; i < children.length; i++) {
if (children[i].nodeName.toLowerCase() === "track") {
kind = children[i].getAttribute("kind");
if (kind === "captions") {
kind = children[i].kind;
if (kind === "captions" || kind === "subtitles") {
captionSrc = children[i].getAttribute("src");
}
}
@ -1081,7 +1081,7 @@
for (var y=0; y < tracks.length; y++) {
var track = tracks[y];
if (track.kind === "captions") {
if (track.kind === "captions" || track.kind === "subtitles") {
_on(track, "cuechange", function() {
// Clear container
player.captionsContainer.innerHTML = "";