web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-12 12:16:27 +02:00
Code Releases Activity

Merge pull request #192 from eikes/master

Browse Source 
Make the components available in the "ready" callback
This commit is contained in:
Steve Heffernan 2012-08-07 16:12:15 -07:00
commit 5e8b6c8455
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/player.js
View File

@ -14,9 +14,6 @@ _V_.Player = _V_.Component.extend({
_V_.merge(options, this.getVideoTagSettings()); // Override with Video Tag Options _V_.merge(options, this.getVideoTagSettings()); // Override with Video Tag Options
_V_.merge(options, addOptions); // Override/extend with options from setup call _V_.merge(options, addOptions); // Override/extend with options from setup call
// Add callback to ready queue
this.ready(ready);
// Store controls setting, and then remove immediately so native controls don't flash. // Store controls setting, and then remove immediately so native controls don't flash.
tag.removeAttribute("controls"); tag.removeAttribute("controls");
@ -85,6 +82,9 @@ _V_.Player = _V_.Component.extend({
}); });
} }
// Add callback to ready queue
this.ready(ready);
// Tracks defined in tracks.js // Tracks defined in tracks.js
this.textTracks = []; this.textTracks = [];
if (options.tracks && options.tracks.length > 0) { if (options.tracks && options.tracks.length > 0) {