From 36ebdf0a1c80849eb39d86d2946c0f5f84d004e3 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Tue, 6 Oct 2015 10:05:54 +0300 Subject: [PATCH] fix copy of selected annotation via menu --- static/js/mainMenu.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js index b1773fb7..22b4d99f 100644 --- a/static/js/mainMenu.js +++ b/static/js/mainMenu.js @@ -412,11 +412,17 @@ pandora.ui.mainMenu = function() { } } else if (data.id == 'copy' || data.id == 'copyadd') { var action = data.id == 'copy' ? 'copy' : 'add', - type = 'clip', clips; + type = 'clip', clip, clips; fromMenu = true; if (pandora.isVideoView() && !pandora.$ui.browser.hasFocus()) { - var clip = ui.videoPoints[ui.item]; - clips = [clip.annotation || ui.item + '/' + clip['in'] + '-' + clip.out]; + clip = ui.item + '/'; + if (ui.videoPoints[ui.item].annotation) { + clip += ui.videoPoints[ui.item].annotation; + } else { + clip += ui.videoPoints[ui.item]['in'] + + '-' + ui.videoPoints[ui.item].out; + } + clips = [clip]; } else if (pandora.isClipView() && !pandora.$ui.browser.hasFocus()) { clips = pandora.$ui.clipList.options('selected'); } else if (ui.section == 'edits') {