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

don't trigger edit annotation event with temporary id (fixes #369)

Browse source
This commit is contained in:
rlx 2012-02-05 02:07:22 +00:00
parent 353fce1f14
commit 8d7d1fdf36
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -1049,7 +1049,8 @@ Ox.VideoEditor = function(options, self) {
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out out: self.options.out
}); });
self.editing && that.triggerEvent('editannotation', { if (self.editing && self.options.selected[0] != '_') {
that.triggerEvent('editannotation', {
id: self.options.selected, id: self.options.selected,
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out, out: self.options.out,
@ -1057,6 +1058,7 @@ Ox.VideoEditor = function(options, self) {
}); });
} }
} }
}
function setPosition(position, playing) { function setPosition(position, playing) {
self.options.position = position; self.options.position = position;