0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

embedTimeline: fix subtitles (fixes #2823)

Browse source
This commit is contained in:
Will Thompson 2015-08-07 13:42:20 +02:00 • committed by j
commit 5418613023
4 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
static/js/tv.js
View file

@ -38,20 +38,6 @@ pandora.ui.tv = function() {
});
}
function getSubtitles(options) {
return options.subtitlesLayer ? options.annotations.filter(function(layer) {
return layer.id == options.subtitlesLayer;
})[0].items.map(function(subtitle) {
return {
id: subtitle.id,
'in': subtitle['in'],
out: subtitle.out,
text: subtitle.value.replace(/\n/g, ' ').replace(/<br\/?>/g, '\n'),
tracks: subtitle.languages || [Ox.getLanguageNameByCode(pandora.site.language)]
};
}) : []
}
function play() {
var $loading = $('<img>')
.attr({src: Ox.UI.getImageURL('symbolLoadingAnimated')})
@ -89,7 +75,7 @@ pandora.ui.tv = function() {
position: result.data.position,
resolution: pandora.user.ui.videoResolution,
scaleToFill: pandora.user.ui.videoScale == 'fill',
subtitles: getSubtitles(videoOptions),
subtitles: pandora.getSubtitles(videoOptions),
subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language),
subtitlesLayer: videoOptions.subtitlesLayer,
subtitlesOffset: pandora.user.ui.videoSubtitlesOffset,