From cd0e9c8151c4b2f85d54299fd7fd99693f85ce7a Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Sun, 14 Jul 2013 16:37:35 +0000 Subject: [PATCH] make 'add to clipboard' work in player and editor --- source/Ox.UI/js/Video/VideoEditor.js | 14 +++++++------- source/Ox.UI/js/Video/VideoPanel.js | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/source/Ox.UI/js/Video/VideoEditor.js b/source/Ox.UI/js/Video/VideoEditor.js index f223336b..6e8d912d 100644 --- a/source/Ox.UI/js/Video/VideoEditor.js +++ b/source/Ox.UI/js/Video/VideoEditor.js @@ -158,6 +158,13 @@ Ox.VideoEditor = function(options, self) { out: self.options.out }]); }, + key_control_shift_c: function() { + that.triggerEvent('copyadd', [{ + annotation: self.options.selected, + 'in': self.options['in'], + out: self.options.out + }]); + }, key_delete: function() { self.$annotationPanel.removeItem(true); }, @@ -223,13 +230,6 @@ Ox.VideoEditor = function(options, self) { key_shift_0: function() { movePositionBy(-self.options.position); }, - key_shift_control_c: function() { - that.triggerEvent('copyadd', [{ - annotation: self.options.selected, - 'in': self.options['in'], - out: self.options.out - }]); - }, key_shift_down: function() { movePositionBy(self.options.duration); }, diff --git a/source/Ox.UI/js/Video/VideoPanel.js b/source/Ox.UI/js/Video/VideoPanel.js index 66233fc5..a17a7017 100644 --- a/source/Ox.UI/js/Video/VideoPanel.js +++ b/source/Ox.UI/js/Video/VideoPanel.js @@ -133,6 +133,13 @@ Ox.VideoPanel = function(options, self) { out: self.options.out }]); }, + key_control_shift_c: function() { + that.triggerEvent('copyadd', [{ + annotation: self.options.selected, + 'in': self.options['in'], + out: self.options.out + }]); + }, key_equal: function() { self.$video.changeVolume(0.1); },