diff options
author | Sam Potts <sam@potts.es> | 2020-04-24 00:34:44 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2020-04-24 00:34:44 +1000 |
commit | ad4f303aa006306c796fc60583f63fd6bc2c9e07 (patch) | |
tree | 12cb2026cf55694f4ef883f0931c6eb7dfa62461 | |
parent | 3b521f73bd773dcb530746db47c90dbb1349b70b (diff) | |
parent | 6aa21c1fae4a7b6dbcf1db1ee3b06f11d674869a (diff) | |
download | plyr-ad4f303aa006306c796fc60583f63fd6bc2c9e07.tar.lz plyr-ad4f303aa006306c796fc60583f63fd6bc2c9e07.tar.xz plyr-ad4f303aa006306c796fc60583f63fd6bc2c9e07.zip |
Merge branch 'master' into develop
# Conflicts:
# readme.md
-rw-r--r-- | .gitpod.yml | 2 | ||||
-rw-r--r-- | contributing.md | 10 | ||||
-rw-r--r-- | readme.md | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/.gitpod.yml b/.gitpod.yml index ded36866..c4a67050 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,5 @@ tasks: - - init: npm install && npm i gulp -g + - before: npm install && npm i gulp -g command: gulp ports: - port: 3000 diff --git a/contributing.md b/contributing.md index b1bcc315..38884f3a 100644 --- a/contributing.md +++ b/contributing.md @@ -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. -### 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. [](https://gitpod.io/from-referrer/) @@ -600,8 +600,6 @@ player.source = { }; ``` -_Note_: `src` can be the video ID or URL - Vimeo example ```javascript @@ -773,7 +771,7 @@ The `enabled` option can be used to disable certain User Agents. For example, if ```javascript { - enabled: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent); + enabled: !/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent); } ``` |