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

make subtitles on BlockVideoTimeline optional

Browse source
This commit is contained in:
rlx 2011-10-20 13:04:04 +00:00
parent 73883cba11
commit bd3ebf5e33
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@ Ox.BlockVideoTimeline = function(options, self) {
position: 0, position: 0,
results: [], results: [],
showPointMarkers: false, showPointMarkers: false,
showSubtitles: false,
subtitles: [], subtitles: [],
width: 0 width: 0
}) })
@ -52,7 +53,7 @@ Ox.BlockVideoTimeline = function(options, self) {
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out, out: self.options.out,
results: self.options.results, results: self.options.results,
subtitles: self.options.subtitles, subtitles: self.options.showSubtitles ? self.options.subtitles : [],
timeline: self.options.getImageURL, timeline: self.options.getImageURL,
width: Math.round(self.options.duration), width: Math.round(self.options.duration),
type: self.options.type type: self.options.type

1
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -242,6 +242,7 @@ Ox.VideoEditor = function(options, self) {
out: self.options.out, out: self.options.out,
position: self.options.position, position: self.options.position,
showPointMarkers: true, showPointMarkers: true,
showSubtitles: true,
subtitles: self.options.subtitles, subtitles: self.options.subtitles,
videoId: self.options.videoId, videoId: self.options.videoId,
width: self.sizes.timeline[1].width width: self.sizes.timeline[1].width