From 7dc86d3ca28b073e6a69a9dd25f236b44414934d Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Sun, 14 Jul 2013 13:42:09 +0000 Subject: [PATCH] clean up video panels --- source/Ox.UI/js/Video/ClipPanel.js | 20 -------------------- source/Ox.UI/js/Video/VideoEditPanel.js | 6 +++--- source/Ox.UI/js/Video/VideoEditor.js | 4 ++-- source/Ox.UI/js/Video/VideoPanel.js | 6 +++--- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/source/Ox.UI/js/Video/ClipPanel.js b/source/Ox.UI/js/Video/ClipPanel.js index f25a5601..0c29aeb7 100644 --- a/source/Ox.UI/js/Video/ClipPanel.js +++ b/source/Ox.UI/js/Video/ClipPanel.js @@ -274,26 +274,6 @@ Ox.ClipPanel = function(options, self) { return self.options.editable && self.options.sort[0].key == 'index'; } - function moveClips(data) { - Ox.Request.clearCache(); - pandora.api.sortClips({ - edit: pandora.user.ui.edit, - ids: data.ids - }) - } - - function openClips(data) { - - } - - function pasteClips() { - - } - - function removeClips() { - - } - function updateSortElement() { } diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js index e0988868..0a1267d4 100644 --- a/source/Ox.UI/js/Video/VideoEditPanel.js +++ b/source/Ox.UI/js/Video/VideoEditPanel.js @@ -74,10 +74,10 @@ Ox.VideoEditPanel = function(options, self) { self.$annotationPanel.options({selected: self.options.selected}); }, showClips: function() { - that.$element.toggle(1); + self.$mainPanel.toggle(1); }, showTimeline: function() { - self.$videoPanel.toggle(1); + self.$videoPanel.toggle(2); }, smallTimelineURL: function() { self.$video.options({timeline: self.options.smallTimelineURL}); @@ -261,7 +261,7 @@ Ox.VideoEditPanel = function(options, self) { }); that.setElement( - Ox.SplitPanel({ + self.$mainPanel = Ox.SplitPanel({ elements: [ { element: self.$videoPanel diff --git a/source/Ox.UI/js/Video/VideoEditor.js b/source/Ox.UI/js/Video/VideoEditor.js index 10b2cd34..f223336b 100644 --- a/source/Ox.UI/js/Video/VideoEditor.js +++ b/source/Ox.UI/js/Video/VideoEditor.js @@ -119,7 +119,7 @@ Ox.VideoEditor = function(options, self) { ); }, showAnnotations: function() { - that.$element.toggle(1); + self.$mainPanel.toggle(1); }, timeline: function() { self.$menuButton.checkItem(self.options.timeline); @@ -826,7 +826,7 @@ Ox.VideoEditor = function(options, self) { }); that.setElement( - Ox.SplitPanel({ + self.$mainPanel = Ox.SplitPanel({ elements: [ { element: Ox.SplitPanel({ diff --git a/source/Ox.UI/js/Video/VideoPanel.js b/source/Ox.UI/js/Video/VideoPanel.js index 23027308..d5602a17 100644 --- a/source/Ox.UI/js/Video/VideoPanel.js +++ b/source/Ox.UI/js/Video/VideoPanel.js @@ -106,7 +106,7 @@ Ox.VideoPanel = function(options, self) { self.$annotationPanel.options({selected: self.options.selected}); }, showAnnotations: function() { - that.$element.toggle(1); + self.$mainPanel.toggle(1); }, showTimeline: function() { self.$videoPanel.toggle(1); @@ -335,7 +335,7 @@ Ox.VideoPanel = function(options, self) { }); that.setElement( - self.$panel = Ox.SplitPanel({ + self.$mainPanel = Ox.SplitPanel({ elements: [ { element: self.$videoPanel @@ -513,7 +513,7 @@ Ox.VideoPanel = function(options, self) { () -> toggle visibility of annotations @*/ that.toggleAnnotations = function() { - that.$element.toggle(1); + self.$mainPanel.toggle(1); }; /*@