From c6c3452853d6088f0ec2d3f7174064e15933a8e9 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Mon, 15 Jul 2013 10:04:56 +0000 Subject: [PATCH] in edits, handle 'add to clipboard'; resize clip list on window resize --- source/Ox.UI/js/Video/ClipPanel.js | 7 +++++-- source/Ox.UI/js/Video/VideoEditPanel.js | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/Ox.UI/js/Video/ClipPanel.js b/source/Ox.UI/js/Video/ClipPanel.js index 48e7670e..f17410a5 100644 --- a/source/Ox.UI/js/Video/ClipPanel.js +++ b/source/Ox.UI/js/Video/ClipPanel.js @@ -28,6 +28,9 @@ Ox.ClipPanel = function(options, self) { updateStatus(); }, duration: updateStatus, + height: function() { + self.$list.size(); + }, sort: function() { updateSortElement(); self.$list.options({ @@ -255,8 +258,8 @@ Ox.ClipPanel = function(options, self) { copy: function(data) { that.triggerEvent('copy', data); }, - cut: function(data) { - that.triggerEvent('cut', data); + copyadd: function(data) { + that.triggerEvent('copyadd', data); }, 'delete': function(data) { that.triggerEvent('remove', data); diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js index 0388e591..a9750b87 100644 --- a/source/Ox.UI/js/Video/VideoEditPanel.js +++ b/source/Ox.UI/js/Video/VideoEditPanel.js @@ -58,6 +58,7 @@ Ox.VideoEditPanel = function(options, self) { }, height: function() { self.$video.options({height: getPlayerHeight()}); + self.$clipPanel.options({height: self.options.height}); }, 'in': function() { setPoint('in', self.options['in']); @@ -254,8 +255,8 @@ Ox.VideoEditPanel = function(options, self) { copy: function(data) { that.triggerEvent('copy', data); }, - cut: function(data) { - that.triggerEvent('cut', data); + copyadd: function(data) { + that.triggerEvent('copyadd', data); }, edit: function(data) { that.triggerEvent('edit', data);