From 9b3c7ddf203bf05d121a63e2bd0ade7ed6156c1a Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 9 Oct 2018 20:06:14 +0200 Subject: [PATCH] no find-in-annotation-layer option in edits --- source/UI/js/Video/AnnotationPanel.js | 7 +++++-- source/UI/js/Video/VideoAnnotationPanel.js | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/UI/js/Video/AnnotationPanel.js b/source/UI/js/Video/AnnotationPanel.js index 7b5eedcb..b21882e2 100644 --- a/source/UI/js/Video/AnnotationPanel.js +++ b/source/UI/js/Video/AnnotationPanel.js @@ -61,6 +61,7 @@ Ox.AnnotationPanel = function(options, self) { selected: '', separator: ';', showCalendar: false, + showFind: false, showLayers: {}, showMap: false, showUsers: false, @@ -490,7 +491,9 @@ Ox.AnnotationPanel = function(options, self) { {id: 'duration', title: Ox._('By Duration'), checked: self.options.sort == 'duration'}, {id: 'text', title: Ox._('By Text'), checked: self.options.sort == 'text'}, {id: 'created', title: Ox._('By Creation Time'), checked: self.options.sort == 'created'} - ]}, + ]} + ], + self.options.showFind ? [ {}, {id: 'results', title: Ox._('Find Annotations'), disabled: true}, {group: 'results', max: 1, items: [ @@ -506,7 +509,7 @@ Ox.AnnotationPanel = function(options, self) { checked: result.id == self.options.highlightLayer }; }))} - ], + ] : [], self.options.editable ? [ {}, {id: 'highlightannotations', title: Ox._('Highlight Annotations'), disabled: true}, diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js index def3375e..2302101d 100644 --- a/source/UI/js/Video/VideoAnnotationPanel.js +++ b/source/UI/js/Video/VideoAnnotationPanel.js @@ -854,6 +854,7 @@ Ox.VideoAnnotationPanel = function(options, self) { selected: self.options.selected, separator: self.options.annotationsSeparator, showCalendar: self.options.showAnnotationsCalendar, + showFind: true, showLayers: Ox.clone(self.options.showLayers), showMap: self.options.showAnnotationsMap, showUsers: self.options.showUsers,