Compare commits

..

11 Commits

Author SHA1 Message Date
cc5b363d66 Version bump 2016-05-11 10:18:34 +10:00
7e53f01d44 Fix for #206 2016-05-11 10:17:28 +10:00
4d67d68c6b Built CSS 2016-05-10 09:35:45 +10:00
ab26525f09 Merge pull request #204 from robinpoort/master
Broken progress bar styling IE10
2016-05-10 09:17:09 +10:00
e431d7594b Fix broken progress bar styling IE10 2016-05-09 17:47:10 +02:00
8b75bec3d2 Fix broken progress bar styling IE10 2016-05-09 17:40:14 +02:00
1a5e56ed46 Fix broken progress bar styling IE10 2016-05-09 17:39:36 +02:00
9ff933e532 Merge pull request #202 from robinpoort/master
Removing duplicate selectors
2016-05-09 19:09:23 +10:00
299dfe4afe Removing duplicate selectors 2016-05-06 12:37:18 +02:00
6921070688 Removing duplicate selectors 2016-05-06 12:36:14 +02:00
39a0a38d07 Bug fix for undefined progress bar 2016-05-01 15:04:09 +10:00
8 changed files with 24 additions and 25 deletions

View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## v1.6.4
- Bug fix for undefined progress bar
## v1.6.3 ## v1.6.3
- Seek back to 0 for all media on ended - Seek back to 0 for all media on ended
- Check for HTML5 video on ended reload - Check for HTML5 video on ended reload

2
dist/plyr.css vendored

File diff suppressed because one or more lines are too long

2
dist/plyr.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "plyr", "name": "plyr",
"version": "1.6.2", "version": "1.6.5",
"description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player", "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "http://plyr.io", "homepage": "http://plyr.io",
"main": "src/js/plyr.js", "main": "src/js/plyr.js",

View File

@ -40,7 +40,7 @@ If you have any cool ideas or features, please let me know by [creating an issue
## Implementation ## Implementation
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.6.3/plyr.js` to `https://cdn.plyr.io/1.6.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.6.5/plyr.js` to `https://cdn.plyr.io/1.6.5/plyr.js`
### Node Package Manager (NPM) ### Node Package Manager (NPM)
@ -71,11 +71,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.6.3/plyr.css"> <link rel="stylesheet" href="https://cdn.plyr.io/1.6.5/plyr.css">
<script src="https://cdn.plyr.io/1.6.3/plyr.js"></script> <script src="https://cdn.plyr.io/1.6.5/plyr.js"></script>
``` ```
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.6.3/sprite.svg`. You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.6.5/sprite.svg`.
### CSS & Styling ### 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.scss` 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.scss` file included in `/src` in your build to save a request.
@ -113,7 +113,7 @@ Using AJAX means you can load the sprite from a different origin. Avoiding the i
c.innerHTML = a.responseText; c.innerHTML = a.responseText;
b.insertBefore(c, b.childNodes[0]); b.insertBefore(c, b.childNodes[0]);
}; };
})(document, 'https://cdn.plyr.io/1.6.3/sprite.svg'); })(document, 'https://cdn.plyr.io/1.6.5/sprite.svg');
</script> </script>
``` ```
@ -188,7 +188,7 @@ Be sure to [validate your caption files](https://quuz.org/webvtt/)
Here's an example of a default setup: Here's an example of a default setup:
```html ```html
<script src="https://cdn.plyr.io/1.6.3/plyr.js"></script> <script src="https://cdn.plyr.io/1.6.5/plyr.js"></script>
<script>plyr.setup();</script> <script>plyr.setup();</script>
``` ```

View File

@ -1,6 +1,6 @@
// ========================================================================== // ==========================================================================
// Plyr // Plyr
// plyr.js v1.6.3 // plyr.js v1.6.5
// https://github.com/selz/plyr // https://github.com/selz/plyr
// License: The MIT License (MIT) // License: The MIT License (MIT)
// ========================================================================== // ==========================================================================
@ -2218,7 +2218,7 @@
progress.value = value; progress.value = value;
} }
// Object of progress + text element // Object of progress + text element
else { else if (progress) {
if (progress.bar) { if (progress.bar) {
progress.bar.value = value; progress.bar.value = value;
} }

View File

@ -76,9 +76,6 @@
&::-moz-range-thumb { &::-moz-range-thumb {
.plyr-range-thumb(); .plyr-range-thumb();
} }
&::-moz-focus-outer {
border: 0;
}
// Microsoft // Microsoft
&::-ms-track { &::-ms-track {
@ -445,17 +442,16 @@
transform-origin: 50% 100%; transform-origin: 50% 100%;
transition: transform .2s .1s ease, opacity .2s .1s ease; transition: transform .2s .1s ease, opacity .2s .1s ease;
// Arrows
&::before { &::before {
// Arrows
content: ''; content: '';
position: absolute; position: absolute;
width: 0; width: 0;
height: 0; height: 0;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
}
// The background triangle // The background triangle
&::before {
bottom: -@plyr-tooltip-arrow-size; bottom: -@plyr-tooltip-arrow-size;
border-right: @plyr-tooltip-arrow-size solid transparent; border-right: @plyr-tooltip-arrow-size solid transparent;
border-top: @plyr-tooltip-arrow-size solid @plyr-tooltip-bg; border-top: @plyr-tooltip-arrow-size solid @plyr-tooltip-bg;
@ -478,6 +474,7 @@
// <progress> element // <progress> element
.plyr__progress { .plyr__progress {
position: relative; position: relative;
display: inline-block;
flex: 1; flex: 1;
input[type="range"] { input[type="range"] {
@ -632,6 +629,7 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
.plyr .plyr__volume { .plyr .plyr__volume {
display: none; display: none;
flex: 1;
position: relative; position: relative;
input[type="range"] { input[type="range"] {

View File

@ -76,9 +76,6 @@
&::-moz-range-thumb { &::-moz-range-thumb {
@include plyr-range-thumb(); @include plyr-range-thumb();
} }
&::-moz-focus-outer {
border: 0;
}
// Microsoft // Microsoft
&::-ms-track { &::-ms-track {
@ -445,17 +442,16 @@
transform-origin: 50% 100%; transform-origin: 50% 100%;
transition: transform .2s .1s ease, opacity .2s .1s ease; transition: transform .2s .1s ease, opacity .2s .1s ease;
// Arrows
&::before { &::before {
// Arrows
content: ''; content: '';
position: absolute; position: absolute;
width: 0; width: 0;
height: 0; height: 0;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
}
// The background triangle // The background triangle
&::before {
bottom: -$plyr-tooltip-arrow-size; bottom: -$plyr-tooltip-arrow-size;
border-right: $plyr-tooltip-arrow-size solid transparent; border-right: $plyr-tooltip-arrow-size solid transparent;
border-top: $plyr-tooltip-arrow-size solid $plyr-tooltip-bg; border-top: $plyr-tooltip-arrow-size solid $plyr-tooltip-bg;
@ -478,6 +474,7 @@
// <progress> element // <progress> element
.plyr__progress { .plyr__progress {
position: relative; position: relative;
display: inline-block;
flex: 1; flex: 1;
input[type="range"] { input[type="range"] {
@ -632,6 +629,7 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
.plyr .plyr__volume { .plyr .plyr__volume {
display: none; display: none;
flex: 1;
position: relative; position: relative;
input[type="range"] { input[type="range"] {