From b89e145660b850afeb7b13f3e1864b040c32ab13 Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 12 Feb 2014 14:55:33 +0000 Subject: [PATCH] main menu: fix cutting clips from edit --- static/js/mainMenu.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js index 1cee5a1c2..d697267a5 100644 --- a/static/js/mainMenu.js +++ b/static/js/mainMenu.js @@ -392,11 +392,20 @@ pandora.ui.mainMenu = function() { } else if (data.id == 'cut' || data.id == 'cutadd') { var action = data.id == 'cut' ? 'copy' : 'add'; fromMenu = true; - pandora.clipboard[action](ui.listSelection, 'item'); - pandora.doHistory('cut', ui.listSelection, ui._list, function() { - pandora.UI.set({listSelection: []}); - pandora.reloadList(); - }); + if (ui.section == 'items') { + pandora.clipboard[action](ui.listSelection, 'item'); + pandora.doHistory('cut', ui.listSelection, ui._list, function() { + pandora.UI.set({listSelection: []}); + pandora.reloadList(); + }); + } else if (ui.section == 'edits') { + var clips = pandora.$ui.editPanel.getSelectedClips(); + pandora.clipboard[action](clips, 'clip'); + pandora.doHistory('cut', clips, ui.edit, function() { + pandora.UI.set({editSelection: []}); + pandora.$ui.editPanel.updatePanel(); + }); + } } else if (data.id == 'copy' || data.id == 'copyadd') { var action = data.id == 'copy' ? 'copy' : 'add'; fromMenu = true;