0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

clean up video panels

Browse source
This commit is contained in:
rlx 2013-07-14 13:42:09 +00:00
parent c8d0969a41
commit 7dc86d3ca2
4 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/Ox.UI/js/Video/ClipPanel.js
View file

@ -274,26 +274,6 @@ Ox.ClipPanel = function(options, self) {
return self.options.editable && self.options.sort[0].key == 'index'; 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() { function updateSortElement() {
} }

6
source/Ox.UI/js/Video/VideoEditPanel.js
View file

@ -74,10 +74,10 @@ Ox.VideoEditPanel = function(options, self) {
self.$annotationPanel.options({selected: self.options.selected}); self.$annotationPanel.options({selected: self.options.selected});
}, },
showClips: function() { showClips: function() {
that.$element.toggle(1); self.$mainPanel.toggle(1);
}, },
showTimeline: function() { showTimeline: function() {
self.$videoPanel.toggle(1); self.$videoPanel.toggle(2);
}, },
smallTimelineURL: function() { smallTimelineURL: function() {
self.$video.options({timeline: self.options.smallTimelineURL}); self.$video.options({timeline: self.options.smallTimelineURL});
@ -261,7 +261,7 @@ Ox.VideoEditPanel = function(options, self) {
}); });
that.setElement( that.setElement(
Ox.SplitPanel({ self.$mainPanel = Ox.SplitPanel({
elements: [ elements: [
{ {
element: self.$videoPanel element: self.$videoPanel

4
source/Ox.UI/js/Video/VideoEditor.js
View file

@ -119,7 +119,7 @@ Ox.VideoEditor = function(options, self) {
); );
}, },
showAnnotations: function() { showAnnotations: function() {
that.$element.toggle(1); self.$mainPanel.toggle(1);
}, },
timeline: function() { timeline: function() {
self.$menuButton.checkItem(self.options.timeline); self.$menuButton.checkItem(self.options.timeline);
@ -826,7 +826,7 @@ Ox.VideoEditor = function(options, self) {
}); });
that.setElement( that.setElement(
Ox.SplitPanel({ self.$mainPanel = Ox.SplitPanel({
elements: [ elements: [
{ {
element: Ox.SplitPanel({ element: Ox.SplitPanel({

6
source/Ox.UI/js/Video/VideoPanel.js
View file

@ -106,7 +106,7 @@ Ox.VideoPanel = function(options, self) {
self.$annotationPanel.options({selected: self.options.selected}); self.$annotationPanel.options({selected: self.options.selected});
}, },
showAnnotations: function() { showAnnotations: function() {
that.$element.toggle(1); self.$mainPanel.toggle(1);
}, },
showTimeline: function() { showTimeline: function() {
self.$videoPanel.toggle(1); self.$videoPanel.toggle(1);
@ -335,7 +335,7 @@ Ox.VideoPanel = function(options, self) {
}); });
that.setElement( that.setElement(
self.$panel = Ox.SplitPanel({ self.$mainPanel = Ox.SplitPanel({
elements: [ elements: [
{ {
element: self.$videoPanel element: self.$videoPanel
@ -513,7 +513,7 @@ Ox.VideoPanel = function(options, self) {
() -> <o> toggle visibility of annotations () -> <o> toggle visibility of annotations
@*/ @*/
that.toggleAnnotations = function() { that.toggleAnnotations = function() {
that.$element.toggle(1); self.$mainPanel.toggle(1);
}; };
/*@ /*@