Merge branch 'master' into develop

# Conflicts: # src/js/utils/is.js
2021-01-29 23:43:10 +11:00
parent 2cebf9b8a3 1aee8f53a7
commit 8596e05df3
28 changed files with 7888 additions and 8971 deletions
@@ -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,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
@@ -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
@@ -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
@@ -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.
@@ -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.3/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.3/plyr.polyfilled.js"></script>
+<script src="https://cdn.plyr.io/3.6.4/plyr.polyfilled.js"></script>
 ```

 ## 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:

 ```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

 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

@@ -61,7 +61,7 @@ const defaults = {
  // Sprite (for icons)
  loadSprite: true,
  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)
  blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -57,6 +57,8 @@ class Fullscreen {

    // Update the UI
    this.update();
+
+    // this.toggle = this.toggle.bind(this);
  }

  // Determine if native supported
@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.6.3
+// plyr.js v3.6.4
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.6.3
+// plyr.js v3.6.4
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -21,11 +21,11 @@ const isTrack = (input) => instanceOf(input, TextTrack) || (!isNullOrUndefined(i
 const isPromise = (input) => instanceOf(input, Promise) && isFunction(input.then);

 const isElement = (input) =>
-  input !== null && 
-  (typeof input === "object") &&
-  (input.nodeType === 1) &&
-  (typeof input.style === "object") &&
-  (typeof input.ownerDocument === "object");
+  input !== null &&
+  typeof input === 'object' &&
+  input.nodeType === 1 &&
+  typeof input.style === 'object' &&
+  typeof input.ownerDocument === 'object';

 const isEmpty = (input) =>
  isNullOrUndefined(input) ||