web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-13 10:32:26 +02:00
Code Releases Activity

@bc-bbay Load plugins before controls. closes #2094

Browse Source
This commit is contained in:
Brandon Bay 2015-04-29 10:15:15 -07:00 committed by David LaPalomento
parent 013d59db76
commit 4fa6a942d9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ CHANGELOG
* @forbesjo added the `scrubbing` property ([view](https://github.com/videojs/video.js/pull/2080))
* @heff switched to border-box sizing for all player elements ([view](https://github.com/videojs/video.js/pull/2082))
* @forbesjo added a vjs-button class to button controls ([view](https://github.com/videojs/video.js/pull/2084))
* @bc-bbay Load plugins before controls ([view](https://github.com/videojs/video.js/pull/2094))
--------------------

14
src/js/player.js
View File

@ -108,6 +108,14 @@ class Player extends Component {
this.scrubbing_ = false;
this.el_ = this.createEl();
// Load plugins
if (options['plugins']) {
Lib.obj.each(options['plugins'], function(key, val){
this[key](val);
}, this);
}
this.initChildren();
// Set isAudio based on whether or not an audio tag was used
@ -138,12 +146,6 @@ class Player extends Component {
// Make player easily findable by ID
Player.players[this.id_] = this;
if (options['plugins']) {
Lib.obj.each(options['plugins'], function(key, val){
this[key](val);
}, this);
}
// When the player is first initialized, trigger activity so components
// like the control bar show themselves if needed
this.userActive_ = true;