diff --git a/static/js/editor.js b/static/js/editor.js index bcca370a..94239c66 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -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, diff --git a/static/js/list.js b/static/js/list.js index 198c02a5..264ef14d 100644 --- a/static/js/list.js +++ b/static/js/list.js @@ -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) { diff --git a/static/js/player.js b/static/js/player.js index 01904e17..3e5fc034 100644 --- a/static/js/player.js +++ b/static/js/player.js @@ -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',