From 1c969a7c2fe95dc7fb9a447811a9cbd4cc1d0b98 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Sun, 14 Jul 2013 10:23:43 +0000 Subject: [PATCH] Video Edit Panel: handle width/height update --- source/Ox.UI/js/Video/VideoEditPanel.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js index 01b8732d..e0988868 100644 --- a/source/Ox.UI/js/Video/VideoEditPanel.js +++ b/source/Ox.UI/js/Video/VideoEditPanel.js @@ -252,10 +252,12 @@ Ox.VideoEditPanel = function(options, self) { that.triggerEvent('select', data); }, sort: function(data) { - self.options.clipSort = data.sort; that.triggerEvent('sort', data); }, - toggle: toggleClips + toggle: toggleClips, + view: function(data) { + that.triggerEvent('view', data); + } }); that.setElement( @@ -286,13 +288,13 @@ Ox.VideoEditPanel = function(options, self) { } function getPlayerHeight() { - return self.options.height - 24 - - self.options.showTimeline * 80 - 1; + return self.options.height - 24 + - self.options.showTimeline * 80 - 1; } function getPlayerWidth() { - return self.options.width - - (self.options.showClips && !self.fullscreen) + return self.options.width + - (self.options.showClips && !self.fullscreen) * self.options.clipSize - 1; } @@ -315,8 +317,8 @@ Ox.VideoEditPanel = function(options, self) { } function getTimelineWidth() { - return self.options.width - - (self.options.showClips && !self.fullscreen) + return self.options.width + - (self.options.showClips && !self.fullscreen) * self.options.clipSize - 16 - 1; } @@ -334,7 +336,7 @@ Ox.VideoEditPanel = function(options, self) { } function resizeendClips(data) { - that.triggerEvent('clipsize', data.size); + that.triggerEvent('size', data.size); } function selectClip(data) { @@ -378,7 +380,7 @@ Ox.VideoEditPanel = function(options, self) { width: getTimelineWidth() }); that.triggerEvent('toggleclips', { - showClips: self.options.showAnnotations + showClips: self.options.showClips }); }