Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
06ed345f29 | |||
e0cd34c996 | |||
06641d5709 | |||
a0d2d5cd24 |
@ -1,5 +1,11 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v1.2.5
|
||||||
|
- Fix for YouTube quality (let them decide quality)
|
||||||
|
|
||||||
|
## v1.2.4
|
||||||
|
- Fix for omitted kind attribute on <track> (fixes #88)
|
||||||
|
|
||||||
## v1.2.3
|
## v1.2.3
|
||||||
- Fix for YouTube on iPhone or unsupported browsers (fallback to YouTube native)
|
- Fix for YouTube on iPhone or unsupported browsers (fallback to YouTube native)
|
||||||
- Docs tidy up
|
- Docs tidy up
|
||||||
|
2
dist/plyr.js
vendored
2
dist/plyr.js
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/docs.css
vendored
2
docs/dist/docs.css
vendored
File diff suppressed because one or more lines are too long
@ -6,7 +6,7 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<!-- Docs styles -->
|
<!-- Docs styles -->
|
||||||
<link rel="stylesheet" href="//cdn.plyr.io/1.2.3/docs.css">
|
<link rel="stylesheet" href="//cdn.plyr.io/1.2.5/docs.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<main>
|
<main>
|
||||||
|
@ -8,10 +8,10 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<!-- Styles -->
|
<!-- 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.5/plyr.css?1">
|
||||||
|
|
||||||
<!-- Docs styles -->
|
<!-- Docs styles -->
|
||||||
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/docs.css?4">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.5/docs.css?1">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
@ -97,13 +97,13 @@
|
|||||||
b.insertBefore(c, b.childNodes[0]);
|
b.insertBefore(c, b.childNodes[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})(document, "https://cdn.plyr.io/1.2.3/sprite.svg");
|
})(document, "https://cdn.plyr.io/1.2.5/sprite.svg");
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Plyr core 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.5/plyr.js?1"></script>
|
||||||
|
|
||||||
<!-- Docs script -->
|
<!-- Docs script -->
|
||||||
<script src="https://cdn.plyr.io/1.2.3/docs.js?1"></script>
|
<script src="https://cdn.plyr.io/1.2.5/docs.js?1"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -25,6 +25,7 @@ nav {
|
|||||||
position: relative;
|
position: relative;
|
||||||
margin: 0 auto @padding-base;
|
margin: 0 auto @padding-base;
|
||||||
max-width: @example-width-video;
|
max-width: @example-width-video;
|
||||||
|
white-space: nowrap;
|
||||||
|
|
||||||
&::before {
|
&::before {
|
||||||
content: "";
|
content: "";
|
||||||
|
@ -167,7 +167,7 @@ build.js(bundles.docs.js, "docs");
|
|||||||
|
|
||||||
// Default gulp task
|
// Default gulp task
|
||||||
gulp.task("default", function(){
|
gulp.task("default", function(){
|
||||||
run("templates", tasks.js, tasks.less, "sprite");
|
run("templates", tasks.js, tasks.less, "sprite", "watch");
|
||||||
});
|
});
|
||||||
|
|
||||||
// Build all JS (inc. templates)
|
// Build all JS (inc. templates)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "plyr",
|
"name": "plyr",
|
||||||
"version": "1.2.3",
|
"version": "1.2.5",
|
||||||
"description": "A simple HTML5 media player using custom controls",
|
"description": "A simple HTML5 media player using custom controls",
|
||||||
"homepage": "http://plyr.io",
|
"homepage": "http://plyr.io",
|
||||||
"main": "gulpfile.js",
|
"main": "gulpfile.js",
|
||||||
|
@ -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.
|
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.5/plyr.js` to `https://cdn.plyr.io/1.2.5/plyr.js`
|
||||||
|
|
||||||
### Bower
|
### Bower
|
||||||
If bower is your thang, you can grab Plyr using:
|
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:
|
If you want to use our CDN, you can use the following:
|
||||||
|
|
||||||
```html
|
```html
|
||||||
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/plyr.css">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.2.5/plyr.css">
|
||||||
<script src="https://cdn.plyr.io/1.2.3/plyr.js"></script>
|
<script src="https://cdn.plyr.io/1.2.5/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.5/sprite.svg`.
|
||||||
|
|
||||||
### CSS
|
### 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.
|
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.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
// Plyr
|
// Plyr
|
||||||
// plyr.js v1.2.3
|
// plyr.js v1.2.5
|
||||||
// https://github.com/selz/plyr
|
// https://github.com/selz/plyr
|
||||||
// License: The MIT License (MIT)
|
// License: The MIT License (MIT)
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@ -559,9 +559,8 @@
|
|||||||
|
|
||||||
fullscreen.isFullScreen = function(element) {
|
fullscreen.isFullScreen = function(element) {
|
||||||
if(typeof element == "undefined") {
|
if(typeof element == "undefined") {
|
||||||
element = document;
|
element = document.body;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (this.prefix) {
|
switch (this.prefix) {
|
||||||
case "":
|
case "":
|
||||||
return document.fullscreenElement == element;
|
return document.fullscreenElement == element;
|
||||||
@ -572,6 +571,9 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
fullscreen.requestFullScreen = function(element) {
|
fullscreen.requestFullScreen = function(element) {
|
||||||
|
if(typeof element == "undefined") {
|
||||||
|
element = document.body;
|
||||||
|
}
|
||||||
return (this.prefix === "") ? element.requestFullScreen() : element[this.prefix + (this.prefix == "ms" ? "RequestFullscreen" : "RequestFullScreen")]();
|
return (this.prefix === "") ? element.requestFullScreen() : element[this.prefix + (this.prefix == "ms" ? "RequestFullscreen" : "RequestFullScreen")]();
|
||||||
};
|
};
|
||||||
fullscreen.cancelFullScreen = function() {
|
fullscreen.cancelFullScreen = function() {
|
||||||
@ -905,7 +907,6 @@
|
|||||||
playerVars: {
|
playerVars: {
|
||||||
autoplay: 0,
|
autoplay: 0,
|
||||||
controls: (player.supported.full ? 0 : 1),
|
controls: (player.supported.full ? 0 : 1),
|
||||||
vq: "hd720",
|
|
||||||
rel: 0,
|
rel: 0,
|
||||||
showinfo: 0,
|
showinfo: 0,
|
||||||
iv_load_policy: 3,
|
iv_load_policy: 3,
|
||||||
@ -1026,8 +1027,8 @@
|
|||||||
|
|
||||||
for (var i = 0; i < children.length; i++) {
|
for (var i = 0; i < children.length; i++) {
|
||||||
if (children[i].nodeName.toLowerCase() === "track") {
|
if (children[i].nodeName.toLowerCase() === "track") {
|
||||||
kind = children[i].getAttribute("kind");
|
kind = children[i].kind;
|
||||||
if (kind === "captions") {
|
if (kind === "captions" || kind === "subtitles") {
|
||||||
captionSrc = children[i].getAttribute("src");
|
captionSrc = children[i].getAttribute("src");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1079,7 +1080,7 @@
|
|||||||
for (var y=0; y < tracks.length; y++) {
|
for (var y=0; y < tracks.length; y++) {
|
||||||
var track = tracks[y];
|
var track = tracks[y];
|
||||||
|
|
||||||
if (track.kind === "captions") {
|
if (track.kind === "captions" || track.kind === "subtitles") {
|
||||||
_on(track, "cuechange", function() {
|
_on(track, "cuechange", function() {
|
||||||
// Clear container
|
// Clear container
|
||||||
player.captionsContainer.innerHTML = "";
|
player.captionsContainer.innerHTML = "";
|
||||||
|
@ -497,7 +497,7 @@
|
|||||||
// Volume control
|
// Volume control
|
||||||
// <input[type='range']> element
|
// <input[type='range']> element
|
||||||
// Specificity is for bootstrap compatibility
|
// Specificity is for bootstrap compatibility
|
||||||
&-volume[type=range] {
|
&-volume[type="range"] {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
|
@ -495,7 +495,7 @@ $bp-captions-large: 768px !default; // When captions jump to the larger fo
|
|||||||
// Volume control
|
// Volume control
|
||||||
// <input[type='range']> element
|
// <input[type='range']> element
|
||||||
// Specificity is for bootstrap compatibility
|
// Specificity is for bootstrap compatibility
|
||||||
&-volume[type=range] {
|
&-volume[type="range"] {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
|
Reference in New Issue
Block a user