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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	demo/dist/demo.js
#	dist/plyr.css
#	dist/plyr.js
This commit is contained in:
Sam Potts
2016-10-23 15:27:28 +11:00
parent 21a30f1b6f a3ed309342
commit 5cecf16d4f
14 changed files with 104 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
readme.md
View File

@ -122,7 +122,7 @@ Include the `plyr.js` script before the closing `</body>` tag and then call `ply
If you want to use our CDN for the JavaScript, you can use the following:
```html
<script src="https://cdn.plyr.io/2.0.7/plyr.js"></script>
<script src="https://cdn.plyr.io/2.0.9/plyr.js"></script>
```
### CSS
@ -135,11 +135,11 @@ Include the `plyr.css` stylsheet into your `<head>`
If you want to use our CDN for the default CSS, you can use the following:
```html
<link rel="stylesheet" href="https://cdn.plyr.io/2.0.7/plyr.css">
<link rel="stylesheet" href="https://cdn.plyr.io/2.0.9/plyr.css">
```
### SVG Sprite
The SVG sprite is loaded automatically from our CDN. To change this, see the [options](#Options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.7/plyr.svg`.
The SVG sprite is loaded automatically from our CDN. To change this, see the [options](#Options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.9/plyr.svg`.
## Advanced
@ -498,7 +498,7 @@ Here's a list of the methods supported:
<tr>
<td><code>on()</code></td>
<td>String, Function</td>
<td>Watch for an event (first argument) and run a callback function (second argument). This saves you doing your own <code>addEventListner</code> code.</td>
<td>Watch for an event (first argument) and run a callback function (second argument). This saves you doing your own <code>addEventListner</code> code. This is chainable.</td>
</tr>
<tr>
<td><code>play()</code></td>
@ -565,6 +565,11 @@ Here's a list of the methods supported:
<td>Boolean</td>
<td>Toggles playback for the player based on either the boolean argument or it's current state.</td>
</tr>
<tr>
<td><code>isPaused()</code></td>
<td>&mdash;</td>
<td>Will return a boolean for whether the media is currently paused.</td>
</tr>
<tr>
<td><code>toggleMute()</code></td>
<td>&mdash;</td>