diff options
| author | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
| commit | 7c6d4666e99f1604c28c57bec12f16bd0fb7e79c (patch) | |
| tree | 2b5e3288defe5760694fe1096cc1d9c3490f3118 /readme.md | |
| parent | 90c5735904354f5fde0dcdae9f8894fe9088739c (diff) | |
| parent | 76bb299c68a6b5cc72729771aca2f0d51078ebc5 (diff) | |
| download | plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.lz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.xz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.zip | |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# demo/dist/demo.css
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# src/js/captions.js
# src/js/plyr.js
Diffstat (limited to 'readme.md')
| -rw-r--r-- | readme.md | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -128,13 +128,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.3.8/plyr.js"></script> +<script src="https://cdn.plyr.io/3.3.10/plyr.js"></script> ``` ...or... ```html -<script src="https://cdn.plyr.io/3.3.8/plyr.polyfilled.js"></script> +<script src="https://cdn.plyr.io/3.3.10/plyr.polyfilled.js"></script> ``` ### CSS @@ -148,13 +148,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.3.8/plyr.css"> +<link rel="stylesheet" href="https://cdn.plyr.io/3.3.10/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.3.8/plyr.svg`. +reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.3.10/plyr.svg`. ## Ads @@ -303,7 +303,7 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke | `invertTime` | Boolean | `true` | Display the current time as a countdown rather than an incremental counter. | | `toggleInvert` | Boolean | `true` | Allow users to click to toggle the above. | | `listeners` | Object | `null` | Allows binding of event listeners to the controls before the default handlers. See the `defaults.js` for available listeners. If your handler prevents default on the event (`event.preventDefault()`), the default handler will not fire. | -| `captions` | Object | `{ active: false, language: window.navigator.language.split('-')[0] }` | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). | +| `captions` | Object | `{ active: false, language: 'auto', update: false }` | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). 'auto' uses the browser language. `update`: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in unselectable language options). | | `fullscreen` | Object | `{ enabled: true, fallback: true, iosNative: false }` | `enabled`: Toggles whether fullscreen should be enabled. `fallback`: Allow fallback to a full-window solution. `iosNative`: whether to use native iOS fullscreen when entering fullscreen (no custom controls) | | `ratio` | String | `16:9` | The aspect ratio you want to use for embedded players. | | `storage` | Object | `{ enabled: true, key: 'plyr' }` | `enabled`: Allow use of local storage to store user settings. `key`: The key name to use. | |