Compare commits

...

16 Commits

Author SHA1 Message Date
Sam Potts e0562752ea Merge pull request #795 from frogg/patch-1
Added link that explains Webkit's autoplay blocker
2018-03-10 23:29:22 +11:00
Frederik Riedel e6db374a72 Added link that explains Webkit's autoplay blocker 2018-02-24 16:19:55 +01:00
Sam Potts ab7f277a1b Merge pull request #769 from redxtech/add-vue-plyr-to-readme
Add vue-plyr to readme
2018-02-06 10:51:42 +11:00
Gabriel Dunn d5a1a7ca1c Add vue-plyr to readme 2018-01-28 23:03:05 -07:00
Sam Potts 79a43120ae Merge pull request #740 from gurinderhans/master
double click player to toggle fullscreen
2018-01-07 22:40:20 +11:00
Sam Potts b79ffacd9c Merge pull request #726 from xDae/master
Added react port
2018-01-05 21:23:45 +11:00
Sam Potts 888c6773d0 Merge pull request #743 from jwpage/patch-1
Fix `enabled` smartphone example in README
2018-01-03 11:45:33 +11:00
Johnson Page cfd653f02a Fix enabled smartphone example in README 2018-01-03 09:55:14 +11:00
Gurinder Hans 838bd49a1d add comment about no fullscreen if player type is audio 2017-12-23 21:47:01 -08:00
Gurinder Hans 800e0dedfb add double click to make full screen support 2017-12-23 21:41:08 -08:00
Jose Miguel Bejarano e6cc4ba1f5 Added react port 2017-12-04 17:05:14 +02:00
Sam Potts 9c4b53d761 Fix for YouTube .getVideoData() issue (fixes #709) 2017-11-14 13:28:52 +01:00
Sam Potts 0ec0addbda Update readme.md 2017-11-07 09:16:41 +11:00
Sam Potts d206b8ab34 Merge pull request #696 from yuriykuzin/enable-speed-controls-on-vimeo
Enable speed controls using Vimeo API
2017-11-06 19:37:47 +11:00
Sam Potts 51c011b733 Merge branch 'master' into enable-speed-controls-on-vimeo 2017-11-06 19:37:02 +11:00
Yuriy e06b689f5c Enable speed controls using Vimeo API 2017-10-26 17:11:19 +03:00
6 changed files with 33 additions and 13 deletions
+3
View File
@@ -1,5 +1,8 @@
# Changelog
## v2.0.18
- Fix for YouTube .getVideoData() issue (fixes #709)
## v2.0.17
- Vimeo controls fix (fixes #697)
- SVG4everybody compatibility fix
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "2.0.17",
"version": "2.0.18",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "2.0.17",
"version": "2.0.18",
"description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "http://plyr.io",
"main": "src/js/plyr.js",
+12 -6
View File
@@ -63,6 +63,12 @@ Created and maintained by Jon Uhlmann ([@jonnitto](https://github.com/jonnitto))
### [Kirby](https://github.com/dpschen/kirby-plyrtag)
Created and maintained by Dominik Pschenitschni ([@dpschen](https://github.com/dpschen))
### [React](https://github.com/xDae/react-plyr)
Created and maintained by Jose Miguel Bejarano ([@xDae](https://github.com/xDae))
### [Vue](https://github.com/redxtech/vue-plyr)
Created and maintained by Gabe Dunn ([@redxtech](https://github.com/redxtech))
## Using package managers
You can grab the source using one of the following package managers.
@@ -137,7 +143,7 @@ Include the `plyr.js` script before the closing `</body>` tag and then call `ply
If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript, you can use the following:
```html
<script src="https://cdn.plyr.io/2.0.17/plyr.js"></script>
<script src="https://cdn.plyr.io/2.0.18/plyr.js"></script>
```
### CSS
@@ -150,11 +156,11 @@ Include the `plyr.css` stylsheet into your `<head>`
If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:
```html
<link rel="stylesheet" href="https://cdn.plyr.io/2.0.17/plyr.css">
<link rel="stylesheet" href="https://cdn.plyr.io/2.0.18/plyr.css">
```
### SVG Sprite
The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.17/plyr.svg`.
The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.18/plyr.svg`.
## Advanced
@@ -229,7 +235,7 @@ Some touch browsers (particularly Mobile Safari on iOS) seem to have issues with
Options must be passed as an object to the `setup()` method as above or as JSON in `data-plyr` attribute on each of your target elements:
```html
<video data-plyr='{ title: "testing" }'></video>
<video data-plyr='{ "title": "testing", "volume": 10 }'></video>
```
Note the single quotes encapsulating the JSON and double quotes on the object keys.
@@ -302,7 +308,7 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
<td><code>autoplay</code></td>
<td>Boolean</td>
<td><code>false</code></td>
<td>Autoplay the media on load. This is generally advised against on UX grounds. It is also disabled on iOS (an Apple limitation).</td>
<td>Autoplay the media on load. This is generally advised against on UX grounds. It is also disabled on <a href="https://webkit.org/blog/7734/auto-play-policy-changes-for-macos/">iOS and macOS</a> (an Apple limitation).</td>
</tr>
<tr>
<td><code>seekTime</code></td>
@@ -1024,7 +1030,7 @@ Fullscreen in Plyr is supported by all browsers that [currently support it](http
The `enabled` option can be used to disable certain User Agents. For example, if you don't want to use Plyr for smartphones, you could use:
```javascript
enabled: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)
enabled: !/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)
```
If a User Agent is disabled but supports `<video>` and `<audio>` natively, it will use the native player.
+15 -4
View File
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v2.0.17
// plyr.js v2.0.18
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================
@@ -44,7 +44,7 @@
displayDuration: true,
loadSprite: true,
iconPrefix: 'plyr',
iconUrl: 'https://cdn.plyr.io/2.0.17/plyr.svg',
iconUrl: 'https://cdn.plyr.io/2.0.18/plyr.svg',
blankUrl: 'https://cdn.plyr.io/static/blank.mp4',
clickToPlay: true,
hideControls: true,
@@ -1768,8 +1768,10 @@
plyr.media.currentTime = 0;
plyr.media.muted = instance.isMuted();
// Set title
config.title = instance.getVideoData().title;
// Set title if possible
if (typeof instance.getVideoData === 'function') {
config.title = instance.getVideoData().title;
}
// Set the tabindex
if (plyr.supported.full) {
@@ -1886,6 +1888,7 @@
byline: false,
portrait: false,
title: false,
speed: true,
transparent: 0,
};
@@ -2226,6 +2229,11 @@
// Toggle fullscreen
function _toggleFullscreen(event) {
// We don't allow fullscreen on audio player
if (plyr.type === 'audio') {
return
}
// Check for native support
var nativeSupport = fullscreen.supportsFullScreen;
@@ -3190,6 +3198,9 @@
// Fullscreen
_proxyListener(plyr.buttons.fullscreen, 'click', config.listeners.fullscreen, _toggleFullscreen);
// Toggle fullscreen when user double clicks on video wrapper
_proxyListener(plyr.container, 'dblclick', config.listeners.fullscreen, _toggleFullscreen);
// Handle user exiting fullscreen by escaping etc
if (fullscreen.supportsFullScreen) {
_on(document, fullscreen.fullScreenEventName, _toggleFullscreen);