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

dont fail if layer does not exist

Browse source
This commit is contained in:
j 2015-09-20 17:50:23 +01:00
parent 5f1d8425a1
commit 8bb7ae436f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/js/utils.js
View file

@ -2047,7 +2047,7 @@ pandora.getVideoOptions = function(data) {
options.annotations[i] = Ox.extend({}, layer, { options.annotations[i] = Ox.extend({}, layer, {
title: Ox._(layer.title), title: Ox._(layer.title),
item: Ox._(layer.item), item: Ox._(layer.item),
items: data.layers[layer.id].map(function(annotation) { items: data.layers[layer.id] ? data.layers[layer.id].map(function(annotation) {
annotation.duration = Math.abs(annotation.out - annotation['in']); annotation.duration = Math.abs(annotation.out - annotation['in']);
annotation.editable = annotation.editable annotation.editable = annotation.editable
|| annotation.user == pandora.user.username || annotation.user == pandora.user.username
@ -2058,7 +2058,7 @@ pandora.getVideoOptions = function(data) {
return Ox.getLanguageNameByCode(language); return Ox.getLanguageNameByCode(language);
}); });
return annotation; return annotation;
}) }) : []
}); });
}); });
data.videoRatio = data.videoRatio || pandora.site.video.previewRatio; data.videoRatio = data.videoRatio || pandora.site.video.previewRatio;