web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-06 11:51:07 +02:00
Code Releases Activity

@Soviut Fixed argument names in some API docs. closes #2714

Browse Source
This commit is contained in:
Ian Zamojc 2015-10-28 16:10:51 -04:00 committed by Gary Katsevman
parent 6e25aef060
commit 871dac9c3a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ CHANGELOG
* @DaveVoyles updated URL to player API docs ([view](https://github.com/videojs/video.js/pull/2685))
* @ ([view](https://github.com/videojs/video.js/pull/2691))
* @kahwee Fixed sandbox plugin example to work in Video.js 5 ([view](https://github.com/videojs/video.js/pull/2691))
* @Soviut Fixed argument names in some API docs ([view](https://github.com/videojs/video.js/pull/2714))
--------------------

10
src/js/video.js
View File

@ -282,9 +282,9 @@ videojs.extend = extendFn;
* // result.bar.b = [4,5,6];
* ```
*
* @param {Object} The options object whose values will be overriden
* @param {Object} The options object with values to override the first
* @param {Object} Any number of additional options objects
* @param {Object} defaults The options object whose values will be overriden
* @param {Object} overrides The options object with values to override the first
* @param {Object} etc Any number of additional options objects
*
* @return {Object} a new object with the merged values
* @mixes videojs
@ -349,8 +349,8 @@ videojs.bind = Fn.bind;
* // --> Should alert 'Plugin added later!'
* ```
*
* @param {String} The plugin name
* @param {Function} The plugin function that will be called with options
* @param {String} name The plugin name
* @param {Function} fn The plugin function that will be called with options
* @mixes videojs
* @method plugin
*/