0x2620/pandora
2
1
Fork 1
Code Issues 1.3k 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
parent 3da3bd37fd
commit 5418613023
4 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
static/js/embedPlayer.js
View file

@ -40,7 +40,7 @@ pandora.ui.embedPlayer = function() {
sizes = getSizes(); sizes = getSizes();
options.height = sizes.videoHeight; options.height = sizes.videoHeight;
video.subtitles = getSubtitles(video); video.subtitles = pandora.getSubtitles(video);
if (options.title) { if (options.title) {
$title = Ox.Element() $title = Ox.Element()
@ -339,20 +339,6 @@ pandora.ui.embedPlayer = function() {
return Ox.$('<canvas>').attr({width: width, height: height})[0].toDataURL(); return Ox.$('<canvas>').attr({width: width, height: height})[0].toDataURL();
} }
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 selectAnnotation(data) { function selectAnnotation(data) {
if (data.id) { if (data.id) {
setPosition(Math.max(data['in'], options['in'] || 0)); setPosition(Math.max(data['in'], options['in'] || 0));

2
static/js/embedTimeline.js
View file

@ -65,7 +65,7 @@ pandora.ui.embedTimeline = function() {
position: options.position, position: options.position,
resolution: Ox.min(pandora.site.video.resolutions), resolution: Ox.min(pandora.site.video.resolutions),
smallTimelineURL: pandora.getMediaURL('/' + ui.item + '/timeline16p.jpg'), smallTimelineURL: pandora.getMediaURL('/' + ui.item + '/timeline16p.jpg'),
subtitles: video.subtitles, subtitles: pandora.getSubtitles(video),
timeline: ui.videoTimeline, timeline: ui.videoTimeline,
timelines: pandora.site.timelines, timelines: pandora.site.timelines,
video: video.video, video: video.video,

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() { function play() {
var $loading = $('<img>') var $loading = $('<img>')
.attr({src: Ox.UI.getImageURL('symbolLoadingAnimated')}) .attr({src: Ox.UI.getImageURL('symbolLoadingAnimated')})
@ -89,7 +75,7 @@ pandora.ui.tv = function() {
position: result.data.position, position: result.data.position,
resolution: pandora.user.ui.videoResolution, resolution: pandora.user.ui.videoResolution,
scaleToFill: pandora.user.ui.videoScale == 'fill', scaleToFill: pandora.user.ui.videoScale == 'fill',
subtitles: getSubtitles(videoOptions), subtitles: pandora.getSubtitles(videoOptions),
subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language), subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language),
subtitlesLayer: videoOptions.subtitlesLayer, subtitlesLayer: videoOptions.subtitlesLayer,
subtitlesOffset: pandora.user.ui.videoSubtitlesOffset, subtitlesOffset: pandora.user.ui.videoSubtitlesOffset,

14
static/js/utils.js
View file

@ -1906,6 +1906,20 @@ pandora.getStatusText = function(data) {
return parts.join(', '); return parts.join(', ');
}; };
pandora.getSubtitles = function(video) {
return video.subtitlesLayer ? video.annotations.filter(function(layer) {
return layer.id == video.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)]
};
}) : [];
};
pandora.getSubtitlesLayer = function() { pandora.getSubtitlesLayer = function() {
return pandora.site.layers.filter(function(layer) { return pandora.site.layers.filter(function(layer) {
return layer.isSubtitles; return layer.isSubtitles;