0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

fix drag and drop from edit to edit and from clips to edit fixes #2247

Browse source
This commit is contained in:
j 2015-03-03 10:36:21 +00:00
commit 1022e3debf
3 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

29
static/js/clipList.js
View file

@ -136,22 +136,10 @@ pandora.ui.clipList = function(videoRatio) {
.addClass('OxMedia')
.bindEvent({
copy: function(data) {
var items = data.ids.map(function(id) {
var item = !ui.item ? id.split('/')[0] : ui.item,
annotations = that.value(id, 'annotations') || [],
annotation = annotations.length ? annotations[0].id : null;
return annotation || item + '/' + that.value(id, 'in') + '-' + that.value(id, 'out');
})
pandora.clipboard.copy(items, 'clip');
pandora.clipboard.copy(serializeClips(data.ids), 'clip');
},
copyadd: function(data) {
var items = data.ids.map(function(id) {
var item = !ui.item ? id.split('/')[0] : ui.item,
annotations = that.value(id, 'annotations') || [],
annotation = annotations.length ? annotations[0].id : null;
return annotation || item + '/' + that.value(id, 'in') + '-' + that.value(id, 'out');
})
pandora.clipboard.add(items, 'clip');
pandora.clipboard.add(serializeClips(data.ids), 'clip');
},
gainfocus: function() {
pandora.$ui.mainMenu.replaceItemMenu();
@ -290,7 +278,18 @@ pandora.ui.clipList = function(videoRatio) {
}
});
pandora.enableDragAndDrop(that, true, 'edits');
function serializeClips(ids) {
return ids.map(function(id) {
var item = !ui.item ? id.split('/')[0] : ui.item,
annotations = that.value(id, 'annotations') || [],
annotation = annotations.length ? annotations[0].id : null;
return annotation || item + '/' + that.value(id, 'in') + '-' + that.value(id, 'out');
});
}
pandora.enableDragAndDrop(that, true, 'edits', function($list) {
return serializeClips($list.options('selected'));
});
return that;
}