From f8dc2b10d350f1751166d988a7bb90d1da547f9f Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Wed, 18 Oct 2017 12:03:07 -0400 Subject: [PATCH] NIFI-4497: - Fixing issue preventing separators in sub context menus. --- .../src/main/webapp/js/nf/canvas/nf-context-menu.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js index 0ebcf6a59f05..a32a47f80edd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js @@ -704,7 +704,9 @@ // whether or not a group item should be included var includeGroupItem = function (groupItem) { - if (groupItem.menuItem) { + if (groupItem.separator) { + return true; + } else if (groupItem.menuItem) { return groupItem.condition(selection); } else { var descendantItems = []; @@ -754,7 +756,12 @@ applicableGroupItems.push(groupItem); } }); - included = applicableGroupItems.length > 0; + + // ensure the included menu items includes more than just separators + var includedMenuItems = $.grep(applicableGroupItems, function (gi) { + return nfCommon.isUndefinedOrNull(gi.separator); + }); + included = includedMenuItems.length > 0; if (included) { addGroupItem(menu, i.id, i.groupMenuItem, applicableGroupItems); }