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

edit panel: handle join

Browse source
This commit is contained in:
rolux 2013-08-10 11:12:09 +00:00
parent ce976a860e
commit c72af378a7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
static/js/editPanel.js
View file

@ -177,7 +177,12 @@ pandora.ui.editPanel = function() {
}); });
}, },
join: function(data) { join: function(data) {
Ox.print('JOIN', data); var clips = [serializeClips(data.ids), serializeClips(data.join)];
pandora.doHistory('join', clips, ui.edit, function(result) {
updateClips(edit.clips.filter(function(clip) {
return !Ox.contains(data.ids, clip.id);
}).concat(result.data.clips));
});
}, },
loop: function(data) { loop: function(data) {
pandora.UI.set({videoLoop: data.loop}); pandora.UI.set({videoLoop: data.loop});