fix multiple id selection in VideoAnnotationPanel chain
This commit is contained in:
parent
8e760c3959
commit
01596fa174
2 changed files with 32 additions and 26 deletions
|
|
@ -581,26 +581,40 @@ Ox.AnnotationFolder = function(options, self) {
|
|||
|
||||
function selectAnnotation(data) {
|
||||
if (self.loaded) {
|
||||
var item = Ox.getObjectById(self.options.items, data.id);
|
||||
self.options.selected = item ? data.id : '';
|
||||
if (self.widget) {
|
||||
if (self.options.type == 'event') {
|
||||
self.$calendar.options({
|
||||
selected: item && isDefined(item) ? item.event.id : ''
|
||||
})
|
||||
.panToEvent();
|
||||
} else {
|
||||
self.$map.options({
|
||||
selected: item && isDefined(item) ? item.place.id : ''
|
||||
})
|
||||
.panToPlace();
|
||||
var extendedData;
|
||||
if (Ox.isArray(data.id) && data.id.length) {
|
||||
var items = data.id.map(id => {
|
||||
return Ox.getObjectById(self.options.items, id);
|
||||
})
|
||||
self.options.selected = data.id;
|
||||
extendedData = Ox.extend(data, {
|
||||
'in': Ox.min(items.map(item => { return item["in"]; })),
|
||||
out: Ox.max(items.map(item => { return item["out"]; })),
|
||||
layer: self.options.id
|
||||
});
|
||||
} else {
|
||||
var item = Ox.getObjectById(self.options.items, data.id)
|
||||
self.options.selected = item ? data.id : '';
|
||||
if (self.widget) {
|
||||
if (self.options.type == 'event') {
|
||||
self.$calendar.options({
|
||||
selected: item && isDefined(item) ? item.event.id : ''
|
||||
})
|
||||
.panToEvent();
|
||||
} else {
|
||||
self.$map.options({
|
||||
selected: item && isDefined(item) ? item.place.id : ''
|
||||
})
|
||||
.panToPlace();
|
||||
}
|
||||
}
|
||||
extendedData = Ox.extend(data, item ? {
|
||||
'in': item['in'],
|
||||
out: item.out,
|
||||
layer: self.options.id
|
||||
} : {});
|
||||
}
|
||||
that.triggerEvent('select', Ox.extend(data, item ? {
|
||||
'in': item['in'],
|
||||
out: item.out,
|
||||
layer: self.options.id
|
||||
} : {}));
|
||||
that.triggerEvent('select', extendedData)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue