decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

pass subtitlesDefaultTrack and resolution in editor

Browse source
This commit is contained in:
j 2014-09-16 13:07:09 +02:00
parent f244476138
commit 8aa95d35f2
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
static/js/editPanel.js
View file

@ -431,6 +431,8 @@ pandora.ui.editPanel = function(isEmbed) {
paused: true,
showIconOnLoad: true,
subtitles: getSubtitles(edit.clips),
subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language),
subtitlesTrack: Ox.getLanguageNameByCode(pandora.site.language),
timeline: getSmallTimelineURL(),
video: getVideos(),
volume: ui.videoVolume,
@ -494,11 +496,7 @@ pandora.ui.editPanel = function(isEmbed) {
function getSubtitles(clips) {
var subtitles = [],
subtitlesLayer = pandora.site.layers.filter(function(layer) {
return layer.isSubtitles;
}).map(function(layer) {
return layer.id;
})[0];
subtitlesLayer = pandora.getSubtitlesLayer();
subtitlesLayer && clips.map(function(clip) {
if (clip.layers[subtitlesLayer]) {
clip.layers[subtitlesLayer].forEach(function(subtitle) {

3
static/js/utils.js
View file

@ -920,7 +920,8 @@ pandora.getClipVideos = function(clip, resolution) {
resolution = resolution || pandora.user.ui.videoResolution;
return Ox.flatten(Ox.range(clip.parts).map(function(i) {
var item = {
src: pandora.getVideoURL(clip.item, resolution, i + 1)
src: pandora.getVideoURL(clip.item, resolution, i + 1),
resolution: resolution
};
if (currentTime + clip.durations[i] <= start || currentTime > end) {
item = null;