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
parent 776b0c4036 9a69ae2599
commit df91f7faac
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.
*/
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.
@ -539,7 +539,7 @@ declare namespace Plyr {
interface FullScreenOptions {
enabled?: boolean;
fallback?: boolean;
fallback?: boolean | 'force';
allowAudio?: boolean;
iosNative?: boolean;
}