diff options
| author | Sam Potts <me@sampotts.me> | 2016-01-14 09:42:36 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-01-14 09:42:36 +1100 |
| commit | e6c30ec137d4bcec69044114f7868461c7c374f0 (patch) | |
| tree | 827fce253d3a004d612f7da2ddfc631f8afbe83d | |
| parent | e05538e480b7313ed6b3e9bbbada62e91203b9c0 (diff) | |
| parent | 9bcd0434db9c0024390ce84d04e4ec3306265376 (diff) | |
| download | plyr-e6c30ec137d4bcec69044114f7868461c7c374f0.tar.lz plyr-e6c30ec137d4bcec69044114f7868461c7c374f0.tar.xz plyr-e6c30ec137d4bcec69044114f7868461c7c374f0.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.js
# readme.md
# src/js/plyr.js
| -rw-r--r-- | readme.md | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -444,9 +444,9 @@ Here's a list of the methods supported: </tr> <tr> <td><code>source(...)</code></td> - <td>Array</td> + <td>Array or (null|undefined)</td> <td> - Set the media source. + Get/Set the media source. <br><br> <strong>string</strong><br> <code>.source("/path/to/video.mp4")</code><br> @@ -458,6 +458,9 @@ Here's a list of the methods supported: <br><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.) + <br><br> + <strong> null or undefined </strong><br> + Returns the current media source. Works for both native videos and embeds. </td> </tr> <tr> @@ -704,3 +707,4 @@ Also these links helped created Plyr: ## Copyright and License [The MIT license](license.md). + |