From 61402492c690e6af2af1612d26398ba2dec8c177 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Sun, 19 Feb 2012 09:06:57 +0000 Subject: [PATCH] make sure doubleclicking on timeline doesn't turn non-editable annotations into editing state --- source/Ox.UI/js/Video/Ox.VideoEditor.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 381026f8..7e7b6f9a 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -334,7 +334,11 @@ Ox.VideoEditor = function(options, self) { top: self.sizes.timeline[1].top + 'px', }) .bindEvent({ - edit: editAnnotation, + edit: function() { + if (isEditable() && !self.editing) { + editAnnotation(); + } + }, position: function(data) { setPosition(data.position); },