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

video annotations panel: only show selected subtitles track on timelines

Browse source
This commit is contained in:
rlx 2014-09-18 14:42:19 +02:00
parent 916c194301
commit 13a339d924
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/Ox.UI/js/Video/VideoAnnotationPanel.js
View file

@ -470,7 +470,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
//matches: self.options.matches, //matches: self.options.matches,
out: self.options.out, out: self.options.out,
position: self.options.position, position: self.options.position,
subtitles: self.options.enableSubtitles ? Ox.clone(self.options.subtitles, true) : [], subtitles: getSubtitles(),
type: self.options.timeline, type: self.options.timeline,
width: self.sizes.timeline[0].width width: self.sizes.timeline[0].width
}) })
@ -500,7 +500,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
results: find(self.options.find), results: find(self.options.find),
showPointMarkers: true, showPointMarkers: true,
state: self.options.selected ? 'selected' : 'default', state: self.options.selected ? 'selected' : 'default',
subtitles: self.options.enableSubtitles ? Ox.clone(self.options.subtitles, true) : [], subtitles: getSubtitles(),
type: self.options.timeline, type: self.options.timeline,
videoId: self.options.videoId, videoId: self.options.videoId,
width: self.sizes.timeline[1].width width: self.sizes.timeline[1].width
@ -1418,6 +1418,9 @@ Ox.VideoAnnotationPanel = function(options, self) {
}); });
}); });
} }
self.$timeline.forEach(function($timeline) {
$timeline.options({subtitles: getSubtitles()});
});
} }
function showKeyboardShortcuts() { function showKeyboardShortcuts() {
@ -1569,7 +1572,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
}); });
if (self.options.enableSubtitles) { if (self.options.enableSubtitles) {
self.$timeline.forEach(function($timeline) { self.$timeline.forEach(function($timeline) {
$timeline.options({subtitles: Ox.clone(self.options.subtitles, true)}); $timeline.options({subtitles: getSubtitles()});
}); });
} }
} }