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

inline functoin only gets called once. fixes #2841

Browse source
This commit is contained in:
j 2015-10-05 12:53:11 +02:00
parent 2e3b61d163
commit 7c630ca0b1
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/js/mainMenu.js
View file

@ -414,11 +414,9 @@ pandora.ui.mainMenu = function() {
var action = data.id == 'copy' ? 'copy' : 'add', var action = data.id == 'copy' ? 'copy' : 'add',
type = 'clip', clips; type = 'clip', clips;
fromMenu = true; fromMenu = true;
function formatClip(clip) {
return clip.annotation || (clip.item||ui.item) + '/' + clip['in'] + '-' + clip.out;
}
if (pandora.isVideoView() && !pandora.$ui.browser.hasFocus()) { if (pandora.isVideoView() && !pandora.$ui.browser.hasFocus()) {
clips = [formatClip(ui.videoPoints[ui.item])]; var clip = ui.videoPoints[ui.item];
clips = [clip.annotation || ui.item + '/' + clip['in'] + '-' + clip.out];
} 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') {