don't blur new annotations
This commit is contained in:
parent
b9709f6702
commit
92ff15c5df
2 changed files with 6 additions and 3 deletions
|
@ -769,7 +769,7 @@ Ox.AnnotationFolder = function(options, self) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (id != item.id) {
|
if (!self.editing && id != item.id) {
|
||||||
self.$annotations.options({selected: self.options.selected});
|
self.$annotations.options({selected: self.options.selected});
|
||||||
}
|
}
|
||||||
showWarnings();
|
showWarnings();
|
||||||
|
|
|
@ -1384,7 +1384,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
|
||||||
out: self.options.out,
|
out: self.options.out,
|
||||||
position: self.options.position
|
position: self.options.position
|
||||||
});
|
});
|
||||||
if (self.editing && self.options.selected[0] != '_') {
|
if (self.editing && self.options.selected.length && self.options.selected[0] != '_') {
|
||||||
that.triggerEvent('editannotation', {
|
that.triggerEvent('editannotation', {
|
||||||
id: self.options.selected,
|
id: self.options.selected,
|
||||||
'in': self.options['in'],
|
'in': self.options['in'],
|
||||||
|
@ -1679,7 +1679,10 @@ Ox.VideoAnnotationPanel = function(options, self) {
|
||||||
@*/
|
@*/
|
||||||
that.updateAnnotation = function(id, annotation) {
|
that.updateAnnotation = function(id, annotation) {
|
||||||
// called from editannotation callback
|
// called from editannotation callback
|
||||||
self.options.selected = annotation.id; // fixme: needed?
|
// id might have changed if new annotation was created
|
||||||
|
if (annotation.id) {
|
||||||
|
self.options.selected = annotation.id;
|
||||||
|
}
|
||||||
if (getSelectedLayer() == self.options.subtitlesLayer) {
|
if (getSelectedLayer() == self.options.subtitlesLayer) {
|
||||||
updateSubtitles();
|
updateSubtitles();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue