decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

edit panel: bug fixes; handle resize

Browse source
This commit is contained in:
rolux 2013-07-14 09:28:08 +00:00
parent 8ba6af3d90
commit 766c12de77
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
static/js/pandora/editPanel.js
View file

@ -44,11 +44,10 @@ pandora.ui.editPanel = function() {
clip.position = edit.duration; clip.position = edit.duration;
edit.duration += clip.duration; edit.duration += clip.duration;
}); });
//Ox.print('EDIT', edit)
pandora.$ui.mainPanel.replaceElement(1, pandora.$ui.mainPanel.replaceElement(1,
that = Ox.VideoEditPanel({ that = pandora.$ui.editPanel = Ox.VideoEditPanel({
clips: edit.clips, clips: edit.clips,
clipsSize: listSize, clipSize: listSize,
clipSort: ui.clipSort, clipSort: ui.clipSort,
clipSortOptions: [/*...*/], clipSortOptions: [/*...*/],
clipView: ui.clipView, clipView: ui.clipView,
@ -162,6 +161,10 @@ pandora.ui.editPanel = function() {
}); });
} }
}, },
resize: function(data) {
// sidebar resize
that.options({width: data.size});
},
resizeclips: function(data) { resizeclips: function(data) {
pandora.UI.set('clipsSize', data.clipsSize); pandora.UI.set('clipsSize', data.clipsSize);
}, },
@ -181,7 +184,7 @@ pandora.ui.editPanel = function() {
pandora.UI.set('videoTimeline', data.timeline); pandora.UI.set('videoTimeline', data.timeline);
}, },
toggleclips: function(data) { toggleclips: function(data) {
pandora.UI.set('showAnnotations', data.showAnnotations); pandora.UI.set('showClips', data.showClips);
}, },
toggletimeline: function(data) { toggletimeline: function(data) {
pandora.UI.set('showTimeline', data.showTimeline); pandora.UI.set('showTimeline', data.showTimeline);
@ -189,10 +192,11 @@ pandora.ui.editPanel = function() {
volume: function(data) { volume: function(data) {
pandora.UI.set('videoVolume', data.volume); pandora.UI.set('videoVolume', data.volume);
}, },
pandora_showannotations: function(data) { pandora_showclips: function(data) {
that.options({showAnnotations: data.value}); that.options({showClips: data.value});
}, },
pandora_showtimeline: function(data) { pandora_showtimeline: function(data) {
Ox.print('SHOWTIMELINE', data);
that.options({showTimeline: data.value}); that.options({showTimeline: data.value});
}, },
pandora_videotimeline: function(data) { pandora_videotimeline: function(data) {
@ -205,7 +209,7 @@ pandora.ui.editPanel = function() {
} }
function updateClips(clips) { function updateClips(clips) {
Ox.Request.clearCache(); Ox.Request.clearCache(); // FIXME: too much
edit.clips = clips; edit.clips = clips;
edit.duration = 0; edit.duration = 0;
edit.clips.forEach(function(clip) { edit.clips.forEach(function(clip) {