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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	src/js/utils/is.js
This commit is contained in:
Sam Potts 2021-01-29 23:43:10 +11:00
commit 8596e05df3
28 changed files with 7888 additions and 8971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/pull_request_template.md vendored
View File

@ -1,8 +1,3 @@
### Link to related issue (if applicable) ### Link to related issue (if applicable)
### Summary of proposed changes ### 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
.travis.yml
View File

@ -2,7 +2,5 @@ language: node_js
node_js: lts/* node_js: lts/*
script: script:
- bash .travis/prevent-base-master.sh
- bash .travis/omit-dist.sh
- npm run lint - npm run lint
- npm run build - npm run build

5
.travis/omit-dist.sh
View File

@ -1,5 +0,0 @@
#!/bin/bash
if [ $TRAVIS_BRANCH == "develop" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qE "^(demo/)?dist/"); then
echo 'Build output ("dist" and "demo/dist") not permitted in develop' >&2
exit 1
fi

5
.travis/prevent-base-master.sh
View File

@ -1,5 +0,0 @@
#!/bin/bash
if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ $TRAVIS_BRANCH == "master" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q "^src/"); then
echo 'The base branch for pull requests must be "develop"' >&2
exit 1
fi

2
CONTRIBUTING.md
View File

@ -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). - 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. - 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.

8
README.md
View File

@ -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. 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 ```html
<script src="https://cdn.plyr.io/3.6.3/plyr.js"></script> <script src="https://cdn.plyr.io/3.6.4/plyr.js"></script>
``` ```
...or... ...or...
```html ```html
<script src="https://cdn.plyr.io/3.6.3/plyr.polyfilled.js"></script> <script src="https://cdn.plyr.io/3.6.4/plyr.polyfilled.js"></script>
``` ```
## CSS ## CSS
@ -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: If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:
```html ```html
<link rel="stylesheet" href="https://cdn.plyr.io/3.6.3/plyr.css" /> <link rel="stylesheet" href="https://cdn.plyr.io/3.6.4/plyr.css" />
``` ```
## SVG Sprite ## 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 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.3/plyr.svg`. reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.6.4/plyr.svg`.
# Ads # Ads

2
demo/dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

3386
demo/dist/demo.js vendored
View File

File diff suppressed because it is too large Load Diff

6
demo/dist/demo.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
demo/dist/demo.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.css vendored
View File

File diff suppressed because one or more lines are too long

3316
dist/plyr.js vendored
View File

File diff suppressed because it is too large Load Diff

4
dist/plyr.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/plyr.min.mjs vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.min.mjs.map vendored
View File

File diff suppressed because one or more lines are too long

3316
dist/plyr.mjs vendored
View File

File diff suppressed because it is too large Load Diff

3380
dist/plyr.polyfilled.js vendored
View File

File diff suppressed because it is too large Load Diff

4
dist/plyr.polyfilled.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.polyfilled.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/plyr.polyfilled.min.mjs vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.polyfilled.min.mjs.map vendored
View File

File diff suppressed because one or more lines are too long

3380
dist/plyr.polyfilled.mjs vendored
View File

File diff suppressed because it is too large Load Diff

2
src/js/config/defaults.js
View File

@ -61,7 +61,7 @@ const defaults = {
// Sprite (for icons) // Sprite (for icons)
loadSprite: true, loadSprite: true,
iconPrefix: 'plyr', iconPrefix: 'plyr',
iconUrl: 'https://cdn.plyr.io/3.6.3/plyr.svg', iconUrl: 'https://cdn.plyr.io/3.6.4/plyr.svg',
// Blank video (used to prevent errors on source change) // Blank video (used to prevent errors on source change)
blankVideo: 'https://cdn.plyr.io/static/blank.mp4', blankVideo: 'https://cdn.plyr.io/static/blank.mp4',

2
src/js/fullscreen.js
View File

@ -57,6 +57,8 @@ class Fullscreen {
// Update the UI // Update the UI
this.update(); this.update();
// this.toggle = this.toggle.bind(this);
} }
// Determine if native supported // Determine if native supported

2
src/js/plyr.js
View File

@ -1,6 +1,6 @@
// ========================================================================== // ==========================================================================
// Plyr // Plyr
// plyr.js v3.6.3 // plyr.js v3.6.4
// https://github.com/sampotts/plyr // https://github.com/sampotts/plyr
// License: The MIT License (MIT) // License: The MIT License (MIT)
// ========================================================================== // ==========================================================================

2
src/js/plyr.polyfilled.js
View File

@ -1,6 +1,6 @@
// ========================================================================== // ==========================================================================
// Plyr Polyfilled Build // Plyr Polyfilled Build
// plyr.js v3.6.3 // plyr.js v3.6.4
// https://github.com/sampotts/plyr // https://github.com/sampotts/plyr
// License: The MIT License (MIT) // License: The MIT License (MIT)
// ========================================================================== // ==========================================================================

10
src/js/utils/is.js
View File

@ -21,11 +21,11 @@ const isTrack = (input) => instanceOf(input, TextTrack) || (!isNullOrUndefined(i
const isPromise = (input) => instanceOf(input, Promise) && isFunction(input.then); const isPromise = (input) => instanceOf(input, Promise) && isFunction(input.then);
const isElement = (input) => const isElement = (input) =>
input !== null && input !== null &&
(typeof input === "object") && typeof input === 'object' &&
(input.nodeType === 1) && input.nodeType === 1 &&
(typeof input.style === "object") && typeof input.style === 'object' &&
(typeof input.ownerDocument === "object"); typeof input.ownerDocument === 'object';
const isEmpty = (input) => const isEmpty = (input) =>
isNullOrUndefined(input) || isNullOrUndefined(input) ||