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

pass entity name to find and findannotations, fixes #2626

Browse source
This commit is contained in:
j 2014-12-23 10:57:01 +00:00
parent 8f9a013236
commit acbb56da65
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/UI/js/Video/AnnotationPanel.js
View file

@ -224,7 +224,7 @@ Ox.AnnotationPanel = function(options, self) {
if (annotation && folder) { if (annotation && folder) {
key = folder.options('id'); key = folder.options('id');
type = folder.options('type'); type = folder.options('type');
value = annotation.value; value = annotation.entity ? annotation.entity.name : annotation.value;
isEditable = annotation.editable; isEditable = annotation.editable;
isEvent = type == 'event'; isEvent = type == 'event';
isPlace = type == 'place'; isPlace = type == 'place';