Compare commits

...

2 Commits

Author SHA1 Message Date
6ae2655923 Version bump 2016-03-14 22:53:11 +11:00
815100cff8 Autoplay bug fixes 2016-03-14 22:50:34 +11:00
4 changed files with 25 additions and 29 deletions

4
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.5.19", "version": "1.5.20",
"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.5.19/plyr.js` to `https://cdn.plyr.io/1.5.19/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.20/plyr.js` to `https://cdn.plyr.io/1.5.20/plyr.js`
### Node Package Manager (NPM) ### Node Package Manager (NPM)
[![npm version](https://badge.fury.io/js/plyr.svg)](https://badge.fury.io/js/plyr) [![npm version](https://badge.fury.io/js/plyr.svg)](https://badge.fury.io/js/plyr)
@ -73,11 +73,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.5.19/plyr.css"> <link rel="stylesheet" href="https://cdn.plyr.io/1.5.20/plyr.css">
<script src="https://cdn.plyr.io/1.5.19/plyr.js"></script> <script src="https://cdn.plyr.io/1.5.20/plyr.js"></script>
``` ```
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.19/sprite.svg`. You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.20/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.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.
@ -179,7 +179,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.5.19/plyr.js"></script> <script src="https://cdn.plyr.io/1.5.20/plyr.js"></script>
<script>plyr.setup();</script> <script>plyr.setup();</script>
``` ```

View File

@ -1,6 +1,6 @@
// ========================================================================== // ==========================================================================
// Plyr // Plyr
// plyr.js v1.5.19 // plyr.js v1.5.20
// https://github.com/selz/plyr // https://github.com/selz/plyr
// License: The MIT License (MIT) // License: The MIT License (MIT)
// ========================================================================== // ==========================================================================
@ -1319,12 +1319,6 @@
// Clean up // Clean up
plyr.embedId = null; plyr.embedId = null;
} }
else {
// Autoplay
if (config.autoplay) {
_play();
}
}
} }
// Setup YouTube/Vimeo // Setup YouTube/Vimeo
@ -1438,7 +1432,7 @@
plyr.embed = new YT.Player(container.id, { plyr.embed = new YT.Player(container.id, {
videoId: videoId, videoId: videoId,
playerVars: { playerVars: {
autoplay: plyr.autoplay ? 1 : 0, autoplay: (config.autoplay ? 1 : 0),
controls: (plyr.supported.full ? 0 : 1), controls: (plyr.supported.full ? 0 : 1),
rel: 0, rel: 0,
showinfo: 0, showinfo: 0,
@ -1628,10 +1622,10 @@
// Always seek to 0 // Always seek to 0
// plyr.embed.api('seekTo', 0); // plyr.embed.api('seekTo', 0);
// Prevent autoplay if needed (seek will play) // Autoplay
//if (!config.autoplay) { if (config.autoplay) {
// plyr.embed.api('pause'); plyr.embed.api('play');
//} }
}); });
} }
@ -2277,6 +2271,11 @@
// Inject the new element // Inject the new element
_prependChild(plyr.container, plyr.media); _prependChild(plyr.container, plyr.media);
// Autoplay the new source?
if (typeof source.autoplay !== 'undefined') {
config.autoplay = source.autoplay;
}
// Set attributes for audio video // Set attributes for audio video
if (_inArray(config.types.html5, plyr.type)) { if (_inArray(config.types.html5, plyr.type)) {
if (config.crossorigin) { if (config.crossorigin) {
@ -2301,9 +2300,6 @@
_toggleClass(plyr.container, config.classes.captions.active, plyr.captionsEnabled); _toggleClass(plyr.container, config.classes.captions.active, plyr.captionsEnabled);
_toggleStyleHook(); _toggleStyleHook();
// Autoplay the new source?
config.autoplay = (source.autoplay || config.autoplay);
// Set new sources for html5 // Set new sources for html5
if (_inArray(config.types.html5, plyr.type)) { if (_inArray(config.types.html5, plyr.type)) {
_insertChildElements('source', source.sources); _insertChildElements('source', source.sources);
@ -2329,11 +2325,6 @@
_displayDuration(); _displayDuration();
} }
// Play if autoplay attribute is present
if (config.autoplay) {
_play();
}
// Set aria title and iframe title // Set aria title and iframe title
config.title = source.title; config.title = source.title;
_setTitle(); _setTitle();
@ -2668,6 +2659,11 @@
// Set title on button and frame // Set title on button and frame
_setTitle(); _setTitle();
// Autoplay
if (config.autoplay) {
_play();
}
} }
// Successful setup // Successful setup