sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests 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

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

@ -48,6 +48,7 @@ Ox.AnnotationFolder = function(options, self) {
position: 0,
range: 'all',
selected: '',
separator: ';',
showInfo: false,
showWidget: false,
sort: 'position',
@ -269,7 +270,7 @@ Ox.AnnotationFolder = function(options, self) {
drag: drag,
dragend: dragend
})
.appendTo(self.$outer);
.appendTo(self.$outer);
}
self.$annotations = Ox.ArrayEditable(Ox.extend({
clickLink: self.options.clickLink,
@ -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) {
@ -315,7 +316,7 @@ Ox.AnnotationFolder = function(options, self) {
if (self.editing) {
// FIXME: changed value will not be saved!
}
that.triggerEvent('add', {value: data.value || ''});
that.triggerEvent('add', {value: data.value || ''});
},
blur: function() {
// the video editor will, if it has not received focus,
@ -684,7 +685,7 @@ Ox.AnnotationFolder = function(options, self) {
/*@
gainFocus <f> gain focus
() -> <o> gain focus
() -> <o> gain focus
@*/
that.gainFocus = function() {
self.$annotations.gainFocus();
@ -696,7 +697,7 @@ Ox.AnnotationFolder = function(options, self) {
};
/*@
removeItem <f> remove item
removeItem <f> remove item
() -> <o> remove selected item
@*/
that.removeItem = function() {
@ -722,7 +723,7 @@ Ox.AnnotationFolder = function(options, self) {
};
/*@
updateItem <f> update item
updateItem <f> update item
(id, data) -> <o> update item
@*/
that.updateItem = function(id, data) {