sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

allow for autocomplete in annotations of type entity (first pass)

Browse source
This commit is contained in:
rolux 2014-12-16 13:02:18 +00:00
commit d6a1dae8b8
5 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -339,6 +339,7 @@ Ox.AnnotationPanel = function(options, self) {
collapsed: !self.options.showLayers[layer.id],
editable: self.options.editable,
highlight: self.options.highlight,
id: layer.id,
'in': self.options['in'],
keyboard: index + 1 + '',
out: self.options.out,
@ -347,7 +348,9 @@ Ox.AnnotationPanel = function(options, self) {
selected: selected,
sort: self.options.sort,
width: self.options.width - Ox.UI.SCROLLBAR_SIZE
}, layer, layer.type == 'event' ? {
}, layer, layer.type == 'entity' ? {
autocomplete: self.options.autocomplete,
} : layer.type == 'event' ? {
showWidget: self.options.showCalendar,
widgetSize: self.options.calendarSize
} : layer.type == 'place' ? {