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

add annotation separator option to video panel

Browse source
This commit is contained in:
rolux 2018-09-12 18:47:34 +02:00
commit 8ea30caf4d
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,7 @@ Ox.AnnotationPanel = function(options, self) {
mapSize: 256,
range: 'all',
selected: '',
separator: ';',
showCalendar: false,
showLayers: {},
showMap: false,
@ -162,7 +163,7 @@ Ox.AnnotationPanel = function(options, self) {
});
if (found) {
return false; // break
}
}
});
return annotation;
}
@ -371,6 +372,7 @@ Ox.AnnotationPanel = function(options, self) {
position: self.options.position,
range: self.options.range,
selected: selected,
separator: self.options.separator,
sort: self.options.sort,
width: self.options.width - Ox.UI.SCROLLBAR_SIZE
}, layer, layer.type == 'event' ? {
@ -707,7 +709,7 @@ Ox.AnnotationPanel = function(options, self) {
};
/*@
blurItem <f> Blur selected item
blurItem <f> Blur selected item
() -> <o> AnnotationPanel
@*/
that.blurItem = function() {
@ -739,7 +741,7 @@ Ox.AnnotationPanel = function(options, self) {
};
/*@
removeItem <f> Remove selected item
removeItem <f> Remove selected item
() -> <o> AnnotationPanel
@*/
that.removeItem = function(remove) {
@ -796,7 +798,7 @@ Ox.AnnotationPanel = function(options, self) {
index = Ox.getIndexById(self.options.layers, id);
if (self.$folder[index] == $folder) {
$folder.blurItem();
}
}
self.options.layers[index].items = items;
self.$folder[index].replaceWith(
self.$folder[index] = renderFolder(self.options.layers[index])
@ -805,5 +807,5 @@ Ox.AnnotationPanel = function(options, self) {
};
return that;
};