sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

move layer selection into annotation options menu

Browse source
This commit is contained in:
j 2018-08-07 17:46:33 +01:00
commit 066de44cd2
2 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -791,28 +791,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
})
.appendTo(self.$menubar);
self.$findLayerSelect = Ox.Select({
items: [
{id: '*', title: Ox._('Find: {0}', [Ox._('All')])},
].concat(self.options.layers.map(function(layer) {
return {
id: layer.id,
title: Ox._('Find: {0}', [Ox._(layer.title)])
}
})),
value: self.options.findLayer,
width: 128,
overlap: 'right',
})
.css({float: 'right', background: 'transparent'})
.bindEvent({
change: function(data) {
self.options.findLayer = data.value;
submitFindInput(self.$findInput.value(), false);
},
})
.appendTo(self.$menubar);
self.$nextButton = Ox.Button({
disabled: true,
style: 'symbol',
@ -920,6 +898,11 @@ Ox.VideoAnnotationPanel = function(options, self) {
that.triggerEvent('findannotations', data);
},
focus: that.gainFocus,
highlightlayer: function(data) {
console.log('!! hl', data)
self.options.findLayer = data;
submitFindInput(self.$findInput.value(), false);
},
importannotations: function() {
that.triggerEvent('importannotations');
},