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

no find-in-annotation-layer option in edits

Browse source
This commit is contained in:
rolux 2018-10-09 20:06:14 +02:00
parent 5b9afde7b3
commit 9b3c7ddf20
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,7 @@ Ox.AnnotationPanel = function(options, self) {
selected: '', selected: '',
separator: ';', separator: ';',
showCalendar: false, showCalendar: false,
showFind: false,
showLayers: {}, showLayers: {},
showMap: false, showMap: false,
showUsers: false, showUsers: false,
@ -490,7 +491,9 @@ Ox.AnnotationPanel = function(options, self) {
{id: 'duration', title: Ox._('By Duration'), checked: self.options.sort == 'duration'}, {id: 'duration', title: Ox._('By Duration'), checked: self.options.sort == 'duration'},
{id: 'text', title: Ox._('By Text'), checked: self.options.sort == 'text'}, {id: 'text', title: Ox._('By Text'), checked: self.options.sort == 'text'},
{id: 'created', title: Ox._('By Creation Time'), checked: self.options.sort == 'created'} {id: 'created', title: Ox._('By Creation Time'), checked: self.options.sort == 'created'}
]}, ]}
],
self.options.showFind ? [
{}, {},
{id: 'results', title: Ox._('Find Annotations'), disabled: true}, {id: 'results', title: Ox._('Find Annotations'), disabled: true},
{group: 'results', max: 1, items: [ {group: 'results', max: 1, items: [
@ -506,7 +509,7 @@ Ox.AnnotationPanel = function(options, self) {
checked: result.id == self.options.highlightLayer checked: result.id == self.options.highlightLayer
}; };
}))} }))}
], ] : [],
self.options.editable ? [ self.options.editable ? [
{}, {},
{id: 'highlightannotations', title: Ox._('Highlight Annotations'), disabled: true}, {id: 'highlightannotations', title: Ox._('Highlight Annotations'), disabled: true},

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

@ -854,6 +854,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
selected: self.options.selected, selected: self.options.selected,
separator: self.options.annotationsSeparator, separator: self.options.annotationsSeparator,
showCalendar: self.options.showAnnotationsCalendar, showCalendar: self.options.showAnnotationsCalendar,
showFind: true,
showLayers: Ox.clone(self.options.showLayers), showLayers: Ox.clone(self.options.showLayers),
showMap: self.options.showAnnotationsMap, showMap: self.options.showAnnotationsMap,
showUsers: self.options.showUsers, showUsers: self.options.showUsers,