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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	README.md
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs
#	dist/plyr.polyfilled.min.mjs.map
#	package.json
#	src/js/plugins/vimeo.js
#	src/js/plugins/youtube.js
#	src/js/ui.js
#	yarn.lock
This commit is contained in:
Sam Potts 2020-10-19 22:31:31 +11:00
commit df91f7faac
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -268,7 +268,7 @@ You can set them in your CSS for all players:
```html ```html
<video class="player" style="--plyr-color-main: #1ac266;"> <video class="player" style="--plyr-color-main: #1ac266;">
... ...
</vieo> </video>
``` ```
### SASS ### SASS
@ -834,6 +834,8 @@ Plyr costs money to run, not only my time. I donate my time for free as I enjoy
- [Sparkk TV](https://www.sparkktv.com/) - [Sparkk TV](https://www.sparkktv.com/)
- [@halfhalftravel](https://www.halfhalftravel.com/) - [@halfhalftravel](https://www.halfhalftravel.com/)
- [BitChute](https://www.bitchute.com) - [BitChute](https://www.bitchute.com)
- [Rutheneum-Bote](https://gymnasium-rutheneum.de/content/newspaper/kreativwettbewerb.php)
- [pressakey.com | Blog-Magazin für Videospiele](https://pressakey.com)
If you want to be added to the list, open a pull request. It'd be awesome to see how you're using Plyr 😎 If you want to be added to the list, open a pull request. It'd be awesome to see how you're using Plyr 😎

4
src/js/plyr.d.ts vendored
View File

@ -362,7 +362,7 @@ declare namespace Plyr {
/** /**
* Specify a URL or path to a blank video file used to properly cancel network requests. * Specify a URL or path to a blank video file used to properly cancel network requests.
*/ */
blankUrl?: string; blankVideo?: string;
/** /**
* Autoplay the media on load. This is generally advised against on UX grounds. It is also disabled by default in some browsers. * Autoplay the media on load. This is generally advised against on UX grounds. It is also disabled by default in some browsers.
@ -539,7 +539,7 @@ declare namespace Plyr {
interface FullScreenOptions { interface FullScreenOptions {
enabled?: boolean; enabled?: boolean;
fallback?: boolean; fallback?: boolean | 'force';
allowAudio?: boolean; allowAudio?: boolean;
iosNative?: boolean; iosNative?: boolean;
} }