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

allow for autocomplete in annotations of type entity (first pass)

Browse source
This commit is contained in:
rolux 2014-12-16 13:02:18 +00:00
commit d6a1dae8b8
5 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -265,7 +265,7 @@ Ox.AnnotationFolder = function(options, self) {
.appendTo(self.$outer);
}
self.$annotations = Ox.ArrayEditable({
self.$annotations = Ox.ArrayEditable(Ox.extend({
clickLink: self.options.clickLink,
editable: self.options.editable,
getSortValue: self.options.type == 'text'
@ -286,7 +286,16 @@ Ox.AnnotationFolder = function(options, self) {
width: self.options.width,
maxHeight: self.options.type == 'text' ? Infinity : void 0,
type: self.options.type == 'text' ? 'textarea' : 'input'
})
}, self.options.type == 'entity' ? {
autocomplete: function(value, callback) {
self.options.autocomplete(self.options.id, value, callback);
},
autocompleteReplace: true,
autocompleteReplaceCorrect: true,
autocompleteSelect: true,
autocompleteSelectHighlight: true,
autocompleteSelectMaxWidth: 256
} : {}))
.bindEvent({
add: function(data) {
if (self.editing) {

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

@ -339,6 +339,7 @@ Ox.AnnotationPanel = function(options, self) {
collapsed: !self.options.showLayers[layer.id],
editable: self.options.editable,
highlight: self.options.highlight,
id: layer.id,
'in': self.options['in'],
keyboard: index + 1 + '',
out: self.options.out,
@ -347,7 +348,9 @@ Ox.AnnotationPanel = function(options, self) {
selected: selected,
sort: self.options.sort,
width: self.options.width - Ox.UI.SCROLLBAR_SIZE
}, layer, layer.type == 'event' ? {
}, layer, layer.type == 'entity' ? {
autocomplete: self.options.autocomplete,
} : layer.type == 'event' ? {
showWidget: self.options.showCalendar,
widgetSize: self.options.calendarSize
} : layer.type == 'place' ? {

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

@ -53,6 +53,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
annotationsSort: 'position',
annotationsTooltip: Ox._('annotations'),
audioTrack: '',
autocomplete: null,
censored: [],
censoredIcon: '',
censoredTooltip: '',
@ -793,6 +794,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
.appendTo(self.$menubar.$element);
self.$annotationPanel = Ox.AnnotationPanel({
autocomplete: self.options.autocomplete,
calendarSize: self.options.annotationsCalendarSize,
clickLink: self.options.clickLink,
editable: true,