0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

support audioTrack in VideoTimelinePanel

Browse source
This commit is contained in:
j 2014-07-24 19:47:00 +02:00
parent 00e6367ca9
commit 78e285bb12
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/Ox.UI/js/Video/VideoTimelinePanel.js
View file

@ -8,6 +8,7 @@ Ox.VideoTimelinePanel <f> Video timeline panel
annoationssize <!> annoationssize annoationssize <!> annoationssize
annotationsrange <!> annotationsrange annotationsrange <!> annotationsrange
annotationssort <!> annotationssort annotationssort <!> annotationssort
audioTrack <s|''> Two-letter ISO 639-1 language code or track name
censored <!> censored censored <!> censored
follow <!> follow follow <!> follow
info <!> info info <!> info
@ -36,6 +37,7 @@ Ox.VideoTimelinePanel = function(options, self) {
annotationsSize: 256, annotationsSize: 256,
annotationsSort: 'position', annotationsSort: 'position',
annotationsTooltip: 'annotations', annotationsTooltip: 'annotations',
audioTrack: '',
censored: [], censored: [],
censoredIcon: '', censoredIcon: '',
censoredTooltip: '', censoredTooltip: '',
@ -107,6 +109,7 @@ Ox.VideoTimelinePanel = function(options, self) {
}); });
self.$player = Ox.VideoTimelinePlayer({ self.$player = Ox.VideoTimelinePlayer({
audioTrack: self.options.audioTrack,
censored: self.options.censored, censored: self.options.censored,
censoredIcon: self.options.censoredIcon, censoredIcon: self.options.censoredIcon,
censoredTooltip: self.options.censoredTooltip, censoredTooltip: self.options.censoredTooltip,

3
source/Ox.UI/js/Video/VideoTimelinePlayer.js
View file

@ -18,6 +18,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
audioTrack: '',
censored: [], censored: [],
censoredIcon: '', censoredIcon: '',
censoredTooltip: '', censoredTooltip: '',
@ -305,6 +306,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
.appendTo(self.$timelines[self.videoLines[1]][0]); .appendTo(self.$timelines[self.videoLines[1]][0]);
self.$frame = Ox.VideoPlayer({ self.$frame = Ox.VideoPlayer({
audioTrack: self.options.audioTrack,
censored: self.options.censored, censored: self.options.censored,
censoredIcon: self.options.censoredIcon, censoredIcon: self.options.censoredIcon,
censoredTooltip: self.options.censoredTooltip, censoredTooltip: self.options.censoredTooltip,
@ -347,6 +349,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
.appendTo(self.$timelines[self.videoLines[0]][0]); .appendTo(self.$timelines[self.videoLines[0]][0]);
self.$video = Ox.VideoPlayer({ self.$video = Ox.VideoPlayer({
audioTrack: self.options.audioTrack,
censored: self.options.censored, censored: self.options.censored,
censoredIcon: self.options.censoredIcon, censoredIcon: self.options.censoredIcon,
censoredTooltip: self.options.censoredTooltip, censoredTooltip: self.options.censoredTooltip,