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

8
source/UI/js/Video/VideoAnnotationPanel.js
View file

@ -50,6 +50,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
annotationsCalendarSize: 256,
annotationsMapSize: 256,
annotationsRange: 'all',
annotationsSeparator: ';',
annotationsSize: 256,
annotationsSort: 'position',
annotationsTooltip: Ox._('annotations'),
@ -843,6 +844,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
position: self.options.position,
range: self.options.annotationsRange,
selected: self.options.selected,
separator: self.options.annotationsSeparator,
showCalendar: self.options.showAnnotationsCalendar,
showLayers: Ox.clone(self.options.showLayers),
showMap: self.options.showAnnotationsMap,
@ -957,7 +959,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
self.$annotationPanel.bindEvent(key, function() {
that.triggerEvent(key);
});
});
});
that.setElement(
self.$mainPanel = Ox.SplitPanel({
@ -1177,7 +1179,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
return size.player[0].height + self.controlsHeight
+ size.timeline[0].height + lines * 16
+ (lines + 3) * self.margin;
}
}
if (self.options.videoSize == 'small') {
width = 0;
widths = Ox.splitInt(contentWidth - 4 * self.margin, 3);
@ -1371,7 +1373,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
out: cut - 1 / self.options.fps
};
return false; // break
}
}
});
setPoint('in', points['in']);
setPoint('out', points.out);