add annotation separator option to video panel
This commit is contained in:
parent
5969900902
commit
8ea30caf4d
3 changed files with 19 additions and 14 deletions
|
@ -48,6 +48,7 @@ Ox.AnnotationFolder = function(options, self) {
|
|||
position: 0,
|
||||
range: 'all',
|
||||
selected: '',
|
||||
separator: ';',
|
||||
showInfo: false,
|
||||
showWidget: false,
|
||||
sort: 'position',
|
||||
|
@ -282,7 +283,7 @@ Ox.AnnotationFolder = function(options, self) {
|
|||
globalAttributes: ['data', 'lang'],
|
||||
highlight: self.options.translate ? Ox._(self.options.highlight) : self.options.highlight,
|
||||
placeholder: Ox._('Loading...'),
|
||||
separator: ';',
|
||||
separator: self.options.separator,
|
||||
sort: self.sort,
|
||||
submitOnBlur: false,
|
||||
tooltipText: self.options.showInfo ? function(item) {
|
||||
|
|
|
@ -57,6 +57,7 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
mapSize: 256,
|
||||
range: 'all',
|
||||
selected: '',
|
||||
separator: ';',
|
||||
showCalendar: false,
|
||||
showLayers: {},
|
||||
showMap: false,
|
||||
|
@ -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' ? {
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue