Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1

Merged
merged 114 commits into from
Mar 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
86c3cf6
v3.6.2
sampotts May 4, 2020
dc8612f
add BitChute to users list
zoomerdev May 5, 2020
ef85cb6
Merge pull request #1822 from zoomerdev/patch-1
sampotts May 5, 2020
1f63806
Fixing "missing code in detail" for PlyrEvent type
akuma06 May 5, 2020
8ce7425
Update link to working dash.js demo (was broken)
jonathanarbely Jun 9, 2020
2ee6ae1
Fix small typo
mercuryseries Jun 27, 2020
68e3944
Add us to the "Used by" list
rutheneum-bote Jun 30, 2020
391afe2
Merge pull request #1889 from rutheneum-bote/patch-1
sampotts Jun 30, 2020
cbd4a7c
Fix PreviewThumbnailsOptions type
iwatakeshi Jul 13, 2020
423b7b2
Merge pull request #1900 from iwatakeshi/patch-1
sampotts Jul 13, 2020
8e0cde2
Bump lodash from 4.17.15 to 4.17.19
dependabot[bot] Jul 16, 2020
0733133
fix issue #1872
hex-ci Jul 29, 2020
4c1ae8f
Check if key is a string before attempt --plyr checking
syed-husain-appspace Jul 30, 2020
7910fea
Please add our website to the "Used by" list
Kithaitaa Aug 5, 2020
6f77e21
chore: fix blankVideo types
ethanve Aug 12, 2020
4eaa1a7
Fix for Slow loading videos not autoplaying
DanielHuntleySBG Aug 14, 2020
9076d05
Fix for Slow loading videos not autoplaying
DanielHuntleySBG Aug 14, 2020
22af7f1
Network requests are not cancelled after the player is destroyed
DanielHuntleySBG Aug 18, 2020
f7e9ee5
Fix merge conflicts
DanielHuntleySBG Aug 18, 2020
75082bc
Fix for apect ratio problem when using Vimeo player on mobile devices…
Aug 28, 2020
d582e43
Merge pull request #1941 from danilstoyanov/vimeo-aspect-ratio-mobile
sampotts Aug 30, 2020
8b0d84a
Merge pull request #1935 from SBGSports/Cancel-network-requests-once-…
sampotts Aug 30, 2020
f75820f
Merge pull request #1931 from SBGSports/Autoplay-issue
sampotts Aug 30, 2020
8261ebd
Merge pull request #1928 from ethanve/patch-1
sampotts Aug 30, 2020
80fbeeb
Merge pull request #1920 from Kithaitaa/Kithaitaa-patch-2
sampotts Aug 30, 2020
b3d3900
Merge pull request #1914 from hex-ci/develop
sampotts Aug 30, 2020
3e70f32
Merge pull request #1904 from sampotts/dependabot/npm_and_yarn/lodash…
sampotts Aug 30, 2020
3a07669
Merge pull request #1916 from syedhusain-appspace/develop
sampotts Aug 30, 2020
11e48b0
Merge pull request #1824 from akuma06/patch-2
sampotts Aug 30, 2020
98dbb2e
Merge pull request #1885 from mercuryseries/patch-1
sampotts Aug 30, 2020
18b3f23
chore: update packages and linting
sampotts Aug 30, 2020
e646207
vimeo oembed api
Benny739 Sep 22, 2020
4d25a33
Invoke custom listener on triggering fullscreen via double-click
gurupras Sep 23, 2020
51cb03d
Fix volume when unmuting from volume 0
stephanefbouchard Sep 29, 2020
6455a6a
adding a nice Svelte plugin that I found
zevaverbach Oct 2, 2020
828abc8
Add missing unit to calc in media query
vincentorback Oct 8, 2020
272d39c
Assigning player's lastSeekTime on rewind/fast forward to prevent imm…
trafium Oct 12, 2020
967206c
fix(plyr.d.ts): add force to FullScreenOptions
tbntdima Oct 14, 2020
30989e4
Merge pull request #1982 from tbntdima/feat/fix-fulscreen-type
sampotts Oct 14, 2020
5a16478
Fix youtube not working when player is inside shadow dom
xansen Oct 18, 2020
93eed08
v3.6.2
sampotts May 4, 2020
2426c25
ESLint to use common config
sampotts Jun 27, 2020
0135e9c
add BitChute to users list
zoomerdev May 5, 2020
760f5f9
Fix aspect ratio issue
sampotts Jun 27, 2020
c77ba3e
Revert noCookie change
sampotts Jun 27, 2020
102fb1a
feat: demo radius tweaks
sampotts Oct 19, 2020
d4b4303
fix: poster image shouldn’t receive click events
sampotts Oct 19, 2020
b6b7db7
chore: package updates
sampotts Oct 19, 2020
fa653a8
chore: linting
sampotts Oct 19, 2020
776b0c4
feat: custom controls option for embedded players
sampotts Oct 19, 2020
7c6316d
Package upgrades
sampotts Jun 27, 2020
02321c3
ESLint to use common config
sampotts Jun 27, 2020
9a69ae2
Linting changes
sampotts Jun 27, 2020
df91f7f
Merge branch 'master' into develop
sampotts Oct 19, 2020
29d3ae0
Merge pull request #1984 from xansen/develop
sampotts Oct 19, 2020
92f3728
Merge pull request #1977 from trafium/prevent-mobile-control-hiding-o…
sampotts Oct 19, 2020
4cf36bf
Merge pull request #1967 from airtimemedia/1934-Youtube-unmute-volume-0
sampotts Oct 19, 2020
664e2b4
Merge pull request #1974 from vincentorback/patch-1
sampotts Oct 19, 2020
03d1e3d
Merge pull request #1972 from zevaverbach/patch-2
sampotts Oct 19, 2020
807efcb
Update README.md
sampotts Oct 19, 2020
3caa37f
Merge pull request #1867 from jonathanarbely/patch-1
sampotts Oct 19, 2020
5d2c288
Merge pull request #1961 from Benny739/master
sampotts Oct 19, 2020
80bdf04
Merge pull request #1963 from gurupras/dblclick-fullscreen-custom-lis…
sampotts Oct 19, 2020
fa6282d
chore: formatting
sampotts Oct 19, 2020
b116e62
fix: revert pointer events change for poster
sampotts Oct 19, 2020
45f7e20
fix: hack for Safari 14 not repainting Vimeo embed on entering fullsc…
sampotts Oct 19, 2020
5c02205
fix: demo using custom controls for YouTube
sampotts Oct 19, 2020
8882317
doc: Add STROLLÿN among the list of Plyr users
micaste Oct 25, 2020
e85737d
Merge pull request #1992 from micaste/patch-2
sampotts Nov 4, 2020
136bb52
Fixes #2005
dirkjf Nov 9, 2020
0d393a5
Merge pull request #2008 from dirkjf/firefox-volume-fix
sampotts Nov 13, 2020
bd8bacb
fix: overflowing volume slider
sampotts Nov 13, 2020
da16c55
chore: clean up CSS
sampotts Nov 14, 2020
cd3962c
fix: hide poster when not using custom controls
sampotts Nov 14, 2020
35ef422
Package upgrades
sampotts Jun 27, 2020
1c715bc
ESLint to use common config
sampotts Jun 27, 2020
c3e1637
Linting changes
sampotts Jun 27, 2020
31861bd
Merge branch 'master' into develop
sampotts Nov 14, 2020
2d4686a
chore: revert customControls default option (to prevent breaking change)
sampotts Nov 14, 2020
36b53d2
docs: changelog for v3.6.3
sampotts Nov 14, 2020
e8d883e
v3.6.3 (#2016)
sampotts Nov 14, 2020
b444aa3
pkg: deploy v3.6.3
sampotts Nov 14, 2020
2ba56fd
Bump bl from 1.2.2 to 1.2.3 (#2017)
dependabot[bot] Nov 14, 2020
c300df5
chore: fix node version
sampotts Nov 14, 2020
87078d7
Merge branch 'master' into develop
sampotts Nov 14, 2020
ca041f2
Bump ini from 1.3.5 to 1.3.7 (#2044)
dependabot[bot] Dec 20, 2020
c853adc
Remove unnecessary calc from media query (#2049)
naomiaz Dec 20, 2020
6a6fb8d
chore: package updates
sampotts Dec 20, 2020
d7195d5
chore: add @babel/plugin-proposal-class-properties
sampotts Dec 20, 2020
ba09bc3
fix: use bound arrow functions in classes
sampotts Dec 20, 2020
32a4039
Enhance types (#1841)
lunika Dec 20, 2020
f00e81a
FIX - object values for the providers must be used (#2053)
syteknet-core Dec 22, 2020
16c134f
Fix to work inside iframes. (#2069)
ajgagnon Jan 23, 2021
7750314
Added --plyr-video-background for having control over the background …
nepomuc Jan 24, 2021
31b5027
Fix issue with not entering iosfullscreen of vimeo videos with playsi…
lordon Jan 29, 2021
f4d6a24
fix: use new syntax for iframe allow attribute
sampotts Jan 29, 2021
7e82ec6
Bump ini from 1.3.5 to 1.3.7 (#2044)
dependabot[bot] Dec 20, 2020
39ff31e
chore: package updates
sampotts Dec 20, 2020
9adf35a
chore: add @babel/plugin-proposal-class-properties
sampotts Dec 20, 2020
b5592b0
fix: use bound arrow functions in classes
sampotts Dec 20, 2020
572aeac
chore: cleanup commented out code
sampotts Jan 29, 2021
2cebf9b
chore: release
sampotts Jan 29, 2021
aa3378f
v3.6.4 (#2089)
sampotts Jan 29, 2021
ea87b9c
Update CONTRIBUTING.md
sampotts Jan 29, 2021
c66dc8b
Update .travis.yml
sampotts Jan 29, 2021
c8e776b
Delete prevent-base-master.sh
sampotts Jan 29, 2021
ad7778e
Delete .travis directory
sampotts Jan 29, 2021
150b07f
Update .travis.yml
sampotts Jan 29, 2021
3096dd9
Update pull_request_template.md
sampotts Jan 29, 2021
a187d07
chore: linting fix
sampotts Jan 29, 2021
1aee8f5
chore: publish 3.6.4
sampotts Jan 29, 2021
8596e05
Merge branch 'master' into develop
sampotts Jan 29, 2021
3b5dc09
Merge pull request #2093 from sampotts/develop
sampotts Jan 29, 2021
028be22
chore: removed dist directories from git
sampotts Jan 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 16 additions & 28 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,30 +1,18 @@
{
"parser": "babel-eslint",
"extends": ["airbnb-base", "prettier"],
"plugins": ["simple-import-sort", "import"],
"env": {
"browser": true,
"es6": true
},
"globals": {
"Plyr": false,
"jQuery": false
},
"rules": {
"import/no-cycle": "warn",
"padding-line-between-statements": [
"error",
{
"blankLine": "never",
"prev": ["singleline-const", "singleline-let", "singleline-var"],
"next": ["singleline-const", "singleline-let", "singleline-var"]
}
],
"sort-imports": "off",
"import/order": "off",
"simple-import-sort/sort": "error"
},
"parserOptions": {
"sourceType": "module"
}
"parser": "babel-eslint",
"extends": ["@sampotts/eslint-config/es6"],
"env": {
"browser": true,
"es6": true
},
"globals": {
"Plyr": false,
"jQuery": false
},
"rules": {
"import/no-cycle": "warn"
},
"parserOptions": {
"sourceType": "module"
}
}
5 changes: 0 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
### Link to related issue (if applicable)

### Summary of proposed changes

### Checklist
- [ ] Use `develop` as the base branch
- [ ] Exclude the gulp build (`/dist` changes) from the PR
- [ ] Test on [supported browsers](https://github.com/sampotts/plyr#browser-support)
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ node_modules
.DS_Store
credentials.json
*.mp4
!dist/blank.mp4
npm-debug.log
yarn-error.log
*.webm
.idea/
dist/
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ credentials.json
deploy.json
yarn.lock
package-lock.json
*.mp4
*.webm
*.mp4
!dist/blank.mp4
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v13.8.0
v12.8
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ language: node_js
node_js: lts/*

script:
- bash .travis/prevent-base-master.sh
- bash .travis/omit-dist.sh
- npm run lint
- npm run build
5 changes: 0 additions & 5 deletions .travis/omit-dist.sh

This file was deleted.

5 changes: 0 additions & 5 deletions .travis/prevent-base-master.sh

This file was deleted.

28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
### v3.6.4

- Remove unnecessary calc from media query (thanks @naomiaz)
- Enhance types (thanks @lunika)
- Fix: Object.values for the providers must be used (thanks @syteknet-core)
- Fix: Improve support inside iframes (thanks @ajgagnon)
- Added --plyr-video-background for having control over the background of a video with alpha channel (webm) or a poster image with alpha channel (thanks @nepomuc)
- Fix issue with not entering iosfullscreen of vimeo videos with playsinline=true (thanks @lordon and @Frosch)
- fix: use new syntax for iframe allow attribute
- chore: package updates
- chore: add @babel/plugin-proposal-class-properties
- fix: use bound arrow functions in classes

### v3.6.3

- Fix volume when unmuting from volume 0 using YouTube (thanks @stephanefbouchard)
- Add missing unit to calc in media query (thanks @vincentorback)
- Assigning player's lastSeekTime on rewind/fast forward to prevent immediate controls hide on mobile (thanks @trafium)
- Fix for volume control overflowing in Firefox (thanks @dirkjf)
- Force fullscreen events to trigger on plyr element (media element in iOS) and not fullscreen container (thanks @theprojectsomething)
- TypeScript types improvements (thanks @akuma06 & @iwatakeshi)
- Dash demo link fixed (thanks @jonathanarbely)
- Fix "A `ReferenceError: _classCallCheck is not defined` error has occurred." error (thanks @hex-ci)
- Fix issue with CSS custom property check (thanks @syedhusain-appspace)
- Fix for slow loading videos not autoplaying (thanks @DanielHuntleySBG)
- Fix for betwork requests are not cancelled after the player is destroyed (thanks @DanielHuntleySBG)
- Added option to disable custom controls for YouTube and Vimeo

### v3.6.2

- Fixes for CSS Custom Property related errors in some build tools (thanks @Bashev)
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ Please follow the instructions in our issue templates. Don't use github issues t
You can use Gitpod (a free online VS Code-like IDE) for contributing. With a single click it will launch a workspace and automatically:

- clone the plyr repo.
- install the dependencies.
- run `gulp` to the start the server.
- install the dependencies with `yarn install` in root directory and "demo" directory.
- run `gulp` in root directory to start the dev server.

So that you can start straight away.

Expand All @@ -49,6 +49,6 @@ So that you can start straight away.

- If your modifications changes the documented behavior or add new features, document these changes in [README.md](README.md).

- When finished, push the changes to your GitHub repository and send a pull request to **develop**. Describe what your PR does.
- When finished, push the changes to your GitHub repository and send a pull request. Describe what your PR does.

- If the Travis build fails, or if you get a code review with change requests, you can fix these by pushing new or rebased commits to the branch.
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Plyr is a simple, lightweight, accessible and customizable HTML5, YouTube and Vi

### Demos

You can try Plyr in Codepen using our minimal templates: [HTML5 video](https://codepen.io/pen?template=bKeqpr), [HTML5 audio](https://codepen.io/pen?template=rKLywR), [YouTube](https://codepen.io/pen?template=GGqbbJ), [Vimeo](https://codepen.io/pen?template=bKeXNq). For Streaming we also have example integrations with: [Dash.js](https://codepen.io/pen?template=zaBgBy), [Hls.js](https://codepen.io/pen?template=oyLKQb) and [Shaka Player](https://codepen.io/pen?template=ZRpzZO)
You can try Plyr in Codepen using our minimal templates: [HTML5 video](https://codepen.io/pen?template=bKeqpr), [HTML5 audio](https://codepen.io/pen?template=rKLywR), [YouTube](https://codepen.io/pen?template=GGqbbJ), [Vimeo](https://codepen.io/pen?template=bKeXNq). For Streaming we also have example integrations with: [Dash.js](https://codepen.io/pen?template=GRoogML), [Hls.js](https://codepen.io/pen?template=oyLKQb) and [Shaka Player](https://codepen.io/pen?template=ZRpzZO)

# Quick setup

Expand Down Expand Up @@ -134,13 +134,13 @@ See [initialising](#initialising) for more information on advanced setups.
You can use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript. There's 2 versions; one with and one without [polyfills](#polyfills). My recommendation would be to manage polyfills seperately as part of your application but to make life easier you can use the polyfilled build.

```html
<script src="https://cdn.plyr.io/3.6.1/plyr.js"></script>
<script src="https://cdn.plyr.io/3.6.4/plyr.js"></script>
```

...or...

```html
<script src="https://cdn.plyr.io/3.6.1/plyr.polyfilled.js"></script>
<script src="https://cdn.plyr.io/3.6.4/plyr.polyfilled.js"></script>
```

## CSS
Expand All @@ -154,13 +154,13 @@ 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/3.6.1/plyr.css" />
<link rel="stylesheet" href="https://cdn.plyr.io/3.6.4/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/3.6.1/plyr.svg`.
reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.6.4/plyr.svg`.

# Ads

Expand All @@ -185,6 +185,7 @@ Here's a list of the properties and what they are used for:
| Name | Description | Default / Fallback |
| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
| `--plyr-color-main` | The primary UI color. | ![#f03c15](https://placehold.it/15/00b3ff/000000?text=+) `#00b3ff` |
| `--plyr-video-background` | The background color of video and poster wrappers for using alpha channel videos and poster images. | `rgba(0, 0, 0, 1)` |
| `--plyr-tab-focus-color` | The color used for the dotted outline when an element is `:focus-visible` (equivalent) keyboard focus. | `--plyr-color-main` |
| `--plyr-badge-background` | The background color for badges in the menu. | ![#4a5464](https://placehold.it/15/4a5464/000000?text=+) `#4a5464` |
| `--plyr-badge-text-color` | The text color for badges. | ![#ffffff](https://placehold.it/15/ffffff/000000?text=+) `#ffffff` |
Expand Down Expand Up @@ -268,7 +269,7 @@ You can set them in your CSS for all players:
```html
<video class="player" style="--plyr-color-main: #1ac266;">
...
</vieo>
</video>
```

### SASS
Expand Down Expand Up @@ -790,6 +791,7 @@ Some awesome folks have made plugins for CMSs and Components for JavaScript fram
| Neos | Jon Uhlmann ([@jonnitto](https://github.com/jonnitto)) | [https://packagist.org/packages/jonnitto/plyr](https://packagist.org/packages/jonnitto/plyr) |
| Kirby | Dominik Pschenitschni ([@dpschen](https://github.com/dpschen)) | [https://github.com/dpschen/kirby-plyrtag](https://github.com/dpschen/kirby-plyrtag) |
| REDAXO | FriendsOfRedaxo / skerbis ([@skerbis](https://friendsofredaxo.github.io)) | [https://github.com/FriendsOfREDAXO/plyr](https://github.com/FriendsOfREDAXO/plyr) |
| svelte-plyr | Ben Woodward / benwoodward ([@benwoodward](https://github.com/benwoodward)) | [https://github.com/benwoodward](https://github.com/benwoodward) |

# Issues

Expand Down Expand Up @@ -833,6 +835,10 @@ Plyr costs money to run, not only my time. I donate my time for free as I enjoy
- [Oscar Radio](http://oscar-radio.xyz/)
- [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)
- [STROLLÿN: Work with a View](https://strollyn.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 😎

Expand Down
1 change: 0 additions & 1 deletion demo/dist/demo.css

This file was deleted.

Loading