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

dont fail adding new annotations while editing an annotation, dont set in/out on 'find again' while editing annotation

Browse source
This commit is contained in:
j 2014-02-13 06:16:09 +00:00
parent a5ed8ed8ed
commit e8d4961db6
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/Ox.UI/js/Video/VideoAnnotationPanel.js
View file

@ -896,6 +896,11 @@ Ox.VideoAnnotationPanel = function(options, self) {
}); });
function addAnnotation(layer) { function addAnnotation(layer) {
if (self.editing) {
self.editing = false;
setTimelineState();
self.$annotationPanel.blurItem();
}
that.triggerEvent('addannotation', { that.triggerEvent('addannotation', {
'in': self.options['in'], 'in': self.options['in'],
layer: layer, layer: layer,
@ -1219,13 +1224,17 @@ Ox.VideoAnnotationPanel = function(options, self) {
// if annotationsRange is 'position', // if annotationsRange is 'position',
// this may cause a deselect // this may cause a deselect
} }
setPoint('in', data['in'], true); if (!self.editing) {
setPoint('out', data.out, true); setPoint('in', data['in'], true);
setPoint('out', data.out, true);
}
}
if (!self.editing) {
self.options.selected = data.id;
self.$annotationPanel.options({selected: self.options.selected});
setTimelineState();
that.triggerEvent('select', {id: self.options.selected});
} }
self.options.selected = data.id;
self.$annotationPanel.options({selected: self.options.selected});
setTimelineState();
that.triggerEvent('select', {id: self.options.selected});
} }
function selectCut() { function selectCut() {