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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	dist/plyr.js
#	readme.md
#	src/js/plyr.js
This commit is contained in:
Sam Potts 2016-01-14 09:42:36 +11:00
commit e6c30ec137
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
readme.md
View File

@ -444,9 +444,9 @@ Here's a list of the methods supported:
</tr> </tr>
<tr> <tr>
<td><code>source(...)</code></td> <td><code>source(...)</code></td>
<td>Array</td> <td>Array or (null|undefined)</td>
<td> <td>
Set the media source. Get/Set the media source.
<br><br> <br><br>
<strong>string</strong><br> <strong>string</strong><br>
<code>.source("/path/to/video.mp4")</code><br> <code>.source("/path/to/video.mp4")</code><br>
@ -458,6 +458,9 @@ Here's a list of the methods supported:
<br><br> <br><br>
<strong>YouTube</strong><br> <strong>YouTube</strong><br>
Currently this API method only accepts a YouTube ID when used with a YouTube player. I will add URL support soon, along with being able to swap between types (e.g. YouTube to Audio or Video and vice versa.) Currently this API method only accepts a YouTube ID when used with a YouTube player. I will add URL support soon, along with being able to swap between types (e.g. YouTube to Audio or Video and vice versa.)
<br><br>
<strong> null or undefined </strong><br>
Returns the current media source. Works for both native videos and embeds.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -704,3 +707,4 @@ Also these links helped created Plyr:
## Copyright and License ## Copyright and License
[The MIT license](license.md). [The MIT license](license.md).