aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2020-10-19 22:31:31 +1100
committerSam Potts <sam@potts.es>2020-10-19 22:31:31 +1100
commitdf91f7faace72e3327500975f8907251f41e9886 (patch)
treece9db4cecb8abc746a80a405142768dc61f69eeb
parent776b0c40367e7a184eb7db2673c246048cb5fcb8 (diff)
parent9a69ae25993f8e2e6b30c2435aba98f779e129ad (diff)
downloadplyr-df91f7faace72e3327500975f8907251f41e9886.tar.lz
plyr-df91f7faace72e3327500975f8907251f41e9886.tar.xz
plyr-df91f7faace72e3327500975f8907251f41e9886.zip
Merge branch 'master' into develop
# 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
-rw-r--r--README.md4
-rw-r--r--src/js/plyr.d.ts4
2 files changed, 5 insertions, 3 deletions
diff --git a/README.md b/README.md
index df7c056f..247e9148 100644
--- a/README.md
+++ b/README.md
@@ -268,7 +268,7 @@ You can set them in your CSS for all players:
```html
<video class="player" style="--plyr-color-main: #1ac266;">
...
-</vieo>
+</video>
```
### 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/)
- [@halfhalftravel](https://www.halfhalftravel.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 😎
diff --git a/src/js/plyr.d.ts b/src/js/plyr.d.ts
index ce8f428a..4b332aeb 100644
--- a/src/js/plyr.d.ts
+++ b/src/js/plyr.d.ts
@@ -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;
}