From 626d012775898a2bcf592ffd05c8d57a2958c6c5 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 21 May 2018 16:14:43 +0100 Subject: [PATCH] Do not disable the export-clipboard menu option with empty selection --- editor/js/main.js | 4 ++-- editor/js/ui/clipboard.js | 12 ------------ editor/js/ui/library.js | 4 ---- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/editor/js/main.js b/editor/js/main.js index cf295e7e7..e65b8f30a 100644 --- a/editor/js/main.js +++ b/editor/js/main.js @@ -410,8 +410,8 @@ {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-import-dialog"}, {id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]} ]}); - menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),disabled:true,options:[ - {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),disabled:true,onselect:"core:show-export-dialog"}, + menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),options:[ + {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-export-dialog"}, {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:"core:library-export"} ]}); menuOptions.push(null); diff --git a/editor/js/ui/clipboard.js b/editor/js/ui/clipboard.js index 2bdd20052..0d7519e10 100644 --- a/editor/js/ui/clipboard.js +++ b/editor/js/ui/clipboard.js @@ -309,18 +309,6 @@ RED.clipboard = (function() { $('').appendTo("body"); - RED.events.on("view:selection-changed",function(selection) { - if (!selection.nodes) { - RED.menu.setDisabled("menu-item-export",true); - RED.menu.setDisabled("menu-item-export-clipboard",true); - RED.menu.setDisabled("menu-item-export-library",true); - } else { - RED.menu.setDisabled("menu-item-export",false); - RED.menu.setDisabled("menu-item-export-clipboard",false); - RED.menu.setDisabled("menu-item-export-library",false); - } - }); - RED.actions.add("core:show-export-dialog",exportNodes); RED.actions.add("core:show-import-dialog",importNodes); diff --git a/editor/js/ui/library.js b/editor/js/ui/library.js index 96aa9efeb..2f78828c3 100644 --- a/editor/js/ui/library.js +++ b/editor/js/ui/library.js @@ -414,12 +414,8 @@ RED.library = (function() { RED.events.on("view:selection-changed",function(selection) { if (!selection.nodes) { - RED.menu.setDisabled("menu-item-export",true); - RED.menu.setDisabled("menu-item-export-clipboard",true); RED.menu.setDisabled("menu-item-export-library",true); } else { - RED.menu.setDisabled("menu-item-export",false); - RED.menu.setDisabled("menu-item-export-clipboard",false); RED.menu.setDisabled("menu-item-export-library",false); } });