From a4ab0c1eb35fc93e8eeb468cde502ca61de655ab Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Thu, 18 Jul 2013 09:57:51 +0000 Subject: [PATCH] video edit panel: fix view event, make icon list draggable, show milliseconds in player --- source/Ox.UI/js/Video/ClipPanel.js | 3 ++- source/Ox.UI/js/Video/VideoEditPanel.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/Ox.UI/js/Video/ClipPanel.js b/source/Ox.UI/js/Video/ClipPanel.js index 3500806d..73ff742c 100644 --- a/source/Ox.UI/js/Video/ClipPanel.js +++ b/source/Ox.UI/js/Video/ClipPanel.js @@ -81,7 +81,7 @@ Ox.ClipPanel = function(options, self) { if (data.id == 'view') { self.options.view = data.checked[0].id; self.$panel.replaceElement(1, self.$list = getList()); - self.$panel.triggerEvent('view', {view: self.options.view}); + that.triggerEvent('view', {view: self.options.view}); } }, click: function(data) { @@ -264,6 +264,7 @@ Ox.ClipPanel = function(options, self) { }); } else { $list = Ox.IconList({ + draggable: true, fixedRatio: pandora.site.video.previewRatio, item: function(data, sort, size) { size = size || 128; // fixme: is this needed? diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js index d6e3ad0a..480a0123 100644 --- a/source/Ox.UI/js/Video/VideoEditPanel.js +++ b/source/Ox.UI/js/Video/VideoEditPanel.js @@ -158,6 +158,7 @@ Ox.VideoEditPanel = function(options, self) { position: self.options.position, resolution: self.options.resolution, scaleToFill: self.options.scaleToFill, + showMilliseconds: 3, subtitles: self.options.subtitles, timeline: self.options.smallTimelineURL, video: self.options.video,