diff --git a/static/js/pandora/editor.js b/static/js/pandora/editor.js index 7e89d8b3..5e374336 100644 --- a/static/js/pandora/editor.js +++ b/static/js/pandora/editor.js @@ -108,13 +108,13 @@ pandora.ui.editor = function(data) { censored: function() { pandora.URL.push(pandora.site.cantPlay.link); }, - copy: function(clips) { - Ox.Clipboard.copy(clips.map(function(clip) { + copy: function(data) { + Ox.Clipboard.copy(data.map(function(clip) { return Ox.extend(clip, {item: ui.item}); }), 'clip'); }, - copyadd: function(clip) { - Ox.Clipboard.add(clips.map(function(clip) { + copyadd: function(data) { + Ox.Clipboard.add(data.map(function(clip) { return Ox.extend(clip, {item: ui.item}); }), 'clip'); }, diff --git a/static/js/pandora/player.js b/static/js/pandora/player.js index 146a7247..7bd954cb 100644 --- a/static/js/pandora/player.js +++ b/static/js/pandora/player.js @@ -70,6 +70,16 @@ pandora.ui.player = function(data) { }); pandora.URL.push(pandora.site.cantPlay.link); }, + copy: function(data) { + Ox.Clipboard.copy(data.map(function(clip) { + return Ox.extend(clip, {item: ui.item}); + }), 'clip'); + }, + copyadd: function(data) { + Ox.Clipboard.add(data.map(function(clip) { + return Ox.extend(clip, {item: ui.item}); + }), 'clip'); + }, downloadvideo: function(data) { document.location.href = '/' + ui.item + '/torrent/'; }, @@ -90,6 +100,14 @@ pandora.ui.player = function(data) { data.position ); }, + points: function(data) { + pandora.UI.set('videoPoints.' + ui.item, { + annotation: ui.videoPoints[ui.item].annotation, + 'in': data['in'], + out: data.out, + position: data.position + }); + }, position: function(data) { pandora.UI.set( 'videoPoints.' + ui.item + '.position',