decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

fix copy of selected annotation via menu

Browse source
This commit is contained in:
j 2015-10-06 10:05:54 +03:00
parent 7c630ca0b1
commit 36ebdf0a1c
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
static/js/mainMenu.js
View file

@ -412,11 +412,17 @@ pandora.ui.mainMenu = function() {
} }
} else if (data.id == 'copy' || data.id == 'copyadd') { } else if (data.id == 'copy' || data.id == 'copyadd') {
var action = data.id == 'copy' ? 'copy' : 'add', var action = data.id == 'copy' ? 'copy' : 'add',
type = 'clip', clips; type = 'clip', clip, clips;
fromMenu = true; fromMenu = true;
if (pandora.isVideoView() && !pandora.$ui.browser.hasFocus()) { if (pandora.isVideoView() && !pandora.$ui.browser.hasFocus()) {
var clip = ui.videoPoints[ui.item]; clip = ui.item + '/';
clips = [clip.annotation || ui.item + '/' + clip['in'] + '-' + clip.out]; 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()) { } else if (pandora.isClipView() && !pandora.$ui.browser.hasFocus()) {
clips = pandora.$ui.clipList.options('selected'); clips = pandora.$ui.clipList.options('selected');
} else if (ui.section == 'edits') { } else if (ui.section == 'edits') {