Skip to content

Commit

Permalink
Updated #1730 to use the ready function instead of warning.
Browse files Browse the repository at this point in the history
Added a line to the changelog for #1730.
closes #1730
  • Loading branch information
heff committed Dec 22, 2014
1 parent fc0730d commit f0d500a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
## HEAD (Unreleased)
* @PeterDaveHello added a Traditional Chinese translation ([view](https://github.com/videojs/video.js/pull/1729))
* @mmcc updated the hide/show functions to use a class instead of inline styles ([view](https://github.com/videojs/video.js/pull/1681))
* @mister-ben added better handling of the additional videojs() arguments when the player is already initialized ([view](https://github.com/videojs/video.js/pull/1730))

--------------------

Expand Down
3 changes: 2 additions & 1 deletion src/js/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ var vjs = function(id, options, ready){
if (options) {
vjs.log.warn ('Player "' + id + '" is already initialised. Options will not be applied.');
}

if (ready) {
vjs.log.warn ('Player "' + id + '" is already initialised. Ready function will not be executed.');
vjs.players[id].ready(ready);
}

return vjs.players[id];
Expand Down

0 comments on commit f0d500a

Please sign in to comment.