0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

remove player/editor/timeline losefocus handlers (opening the item menu will make them lose focus), add gainfocus handler to browser; correct definition of canCut; enable mainMenu.replaceItemMenu

Browse source
This commit is contained in:
rolux 2013-08-02 17:01:24 +00:00
commit bcf9d37930
6 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/js/mainMenu.js
View file

@ -817,7 +817,8 @@ pandora.ui.mainMenu = function() {
: !!ui.listSelection.length,
canPaste = !ui.item && !isClipView && !isVideoView
&& listData.editable && listData.type == 'static' && Ox.Clipboard.type() == 'item',
canCut = canCopy && canPaste;
canCut = canCopy && !ui.item && !isClipView && !isVideoView
&& listData.editable && listData.type == 'static';
return { id: 'itemMenu', title: Ox._('Item'), items: [
{ id: 'add', title: Ox._('Add {0}', [Ox._(pandora.site.itemName.singular)]), disabled: pandora.site.itemRequiresVideo || !pandora.site.capabilities.canAddItems[pandora.user.level] },
{ id: 'upload', title: Ox._('Upload Video...'), disabled: !pandora.site.capabilities.canAddItems[pandora.user.level] },
@ -987,8 +988,7 @@ pandora.ui.mainMenu = function() {
}
that.replaceItemMenu = function() {
// FIXME: on opening the menu, this throws in Ox.Focus
// that.replaceMenu('itemMenu', getItemMenu());
that.replaceMenu('itemMenu', getItemMenu());
return that;
};