Compare commits
2 commits
8f059e373a
...
060e4040cb
| Author | SHA1 | Date | |
|---|---|---|---|
| 060e4040cb | |||
| ef916610a7 |
3 changed files with 26 additions and 4 deletions
|
|
@ -43,7 +43,7 @@ pandora.ui.editor = function(data) {
|
|||
},
|
||||
height: pandora.$ui.contentPanel.size(1),
|
||||
id: 'editor',
|
||||
'in': ui.videoPoints[ui.item]['in'],
|
||||
'in': ui.videoPoints[ui.item]['in'] || 0,
|
||||
itemName: pandora.site.itemName,
|
||||
layers: data.annotations.map(function(layer) {
|
||||
return Ox.extend({
|
||||
|
|
@ -86,7 +86,7 @@ pandora.ui.editor = function(data) {
|
|||
}),
|
||||
loop: ui.videoLoop,
|
||||
muted: ui.videoMuted,
|
||||
out: ui.videoPoints[ui.item].out,
|
||||
out: ui.videoPoints[ui.item].out || 0,
|
||||
position: ui.videoPoints[ui.item].position,
|
||||
posterFrame: data.posterFrame,
|
||||
resolution: ui.videoResolution,
|
||||
|
|
|
|||
|
|
@ -439,6 +439,28 @@ pandora.ui.list = function() {
|
|||
pandora.UI.set({listSelection: []});
|
||||
pandora.reloadList();
|
||||
});
|
||||
} else if (
|
||||
pandora.hasCapability('canRemoveItems')
|
||||
&& pandora.user.ui._list == ''
|
||||
&& data.ids.every(function(item) {
|
||||
return pandora.$ui.list.value(item, 'editable');
|
||||
})
|
||||
) {
|
||||
pandora.api.find({
|
||||
query: {
|
||||
conditions: ui.listSelection.map(function(id) {
|
||||
return {key: 'id', value: id, operator: '=='}
|
||||
}),
|
||||
operator: '|'
|
||||
},
|
||||
keys: ['id', 'title'],
|
||||
range: [0, ui.listSelection.length]
|
||||
}, function(result) {
|
||||
pandora.$ui.deleteItemsDialog = pandora.ui.deleteItemsDialog({
|
||||
items: result.data.items
|
||||
}).open();
|
||||
});
|
||||
|
||||
}
|
||||
},
|
||||
init: function(data) {
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@ pandora.ui.player = function(data) {
|
|||
);
|
||||
},
|
||||
height: pandora.$ui.contentPanel.size(1),
|
||||
'in': ui.videoPoints[ui.item]['in'],
|
||||
'in': ui.videoPoints[ui.item]['in'] || 0,
|
||||
itemName: pandora.site.itemName,
|
||||
layers: data.annotations,
|
||||
loop: ui.videoLoop,
|
||||
muted: ui.videoMuted,
|
||||
out: ui.videoPoints[ui.item].out,
|
||||
out: ui.videoPoints[ui.item].out || 0,
|
||||
position: ui.videoPoints[ui.item].position,
|
||||
resolution: ui.videoResolution,
|
||||
scaleToFill: ui.videoScale == 'fill',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue