0x2620/oxjs
2
0
Fork 1
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
parent 5969900902
commit 8ea30caf4d
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/UI/js/Video/AnnotationFolder.js
View file

@ -48,6 +48,7 @@ Ox.AnnotationFolder = function(options, self) {
position: 0, position: 0,
range: 'all', range: 'all',
selected: '', selected: '',
separator: ';',
showInfo: false, showInfo: false,
showWidget: false, showWidget: false,
sort: 'position', sort: 'position',
@ -282,7 +283,7 @@ Ox.AnnotationFolder = function(options, self) {
globalAttributes: ['data', 'lang'], globalAttributes: ['data', 'lang'],
highlight: self.options.translate ? Ox._(self.options.highlight) : self.options.highlight, highlight: self.options.translate ? Ox._(self.options.highlight) : self.options.highlight,
placeholder: Ox._('Loading...'), placeholder: Ox._('Loading...'),
separator: ';', separator: self.options.separator,
sort: self.sort, sort: self.sort,
submitOnBlur: false, submitOnBlur: false,
tooltipText: self.options.showInfo ? function(item) { tooltipText: self.options.showInfo ? function(item) {

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

@ -57,6 +57,7 @@ Ox.AnnotationPanel = function(options, self) {
mapSize: 256, mapSize: 256,
range: 'all', range: 'all',
selected: '', selected: '',
separator: ';',
showCalendar: false, showCalendar: false,
showLayers: {}, showLayers: {},
showMap: false, showMap: false,
@ -371,6 +372,7 @@ Ox.AnnotationPanel = function(options, self) {
position: self.options.position, position: self.options.position,
range: self.options.range, range: self.options.range,
selected: selected, selected: selected,
separator: self.options.separator,
sort: self.options.sort, sort: self.options.sort,
width: self.options.width - Ox.UI.SCROLLBAR_SIZE width: self.options.width - Ox.UI.SCROLLBAR_SIZE
}, layer, layer.type == 'event' ? { }, layer, layer.type == 'event' ? {

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

@ -50,6 +50,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
annotationsCalendarSize: 256, annotationsCalendarSize: 256,
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSeparator: ';',
annotationsSize: 256, annotationsSize: 256,
annotationsSort: 'position', annotationsSort: 'position',
annotationsTooltip: Ox._('annotations'), annotationsTooltip: Ox._('annotations'),
@ -843,6 +844,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
position: self.options.position, position: self.options.position,
range: self.options.annotationsRange, range: self.options.annotationsRange,
selected: self.options.selected, selected: self.options.selected,
separator: self.options.annotationsSeparator,
showCalendar: self.options.showAnnotationsCalendar, showCalendar: self.options.showAnnotationsCalendar,
showLayers: Ox.clone(self.options.showLayers), showLayers: Ox.clone(self.options.showLayers),
showMap: self.options.showAnnotationsMap, showMap: self.options.showAnnotationsMap,