Merge branch 'master' into develop

# Conflicts:
#	readme.md
This commit is contained in:
Sam Potts 2020-04-24 00:34:44 +10:00
commit ad4f303aa0
3 changed files with 10 additions and 6 deletions

View File

@ -1,5 +1,5 @@
tasks: tasks:
- init: npm install && npm i gulp -g - before: npm install && npm i gulp -g
command: gulp command: gulp
ports: ports:
- port: 3000 - port: 3000

View File

@ -29,9 +29,15 @@ Please follow the instructions in our issue templates. Don't use github issues t
* To test locally, you can use the demo site. First make sure you have installed the dependencies with `npm install` or `yarn`. Run `gulp` to build and it will run a local web server for development and watch for any changes. * To test locally, you can use the demo site. First make sure you have installed the dependencies with `npm install` or `yarn`. Run `gulp` to build and it will run a local web server for development and watch for any changes.
### Online one-click setup ### Online one-click setup for contributing
Alternatively can also use Gitpod, a free online Visual Studio Code-like IDE. With a single click it will automatically launch a ready-to-code workspace with all the dependencies pre-installed, gulp watching for changes and the web server running, so that you can start coding straightaway. 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.
So that you can start straight away.
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/) [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/)

View File

@ -600,8 +600,6 @@ player.source = {
}; };
``` ```
_Note_: `src` can be the video ID or URL
Vimeo example Vimeo example
```javascript ```javascript
@ -773,7 +771,7 @@ The `enabled` option can be used to disable certain User Agents. For example, if
```javascript ```javascript
{ {
enabled: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent); enabled: !/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent);
} }
``` ```