From f8d20760afb403a42bbedcf9dacd0775bf385360 Mon Sep 17 00:00:00 2001 From: Michael Bolin Date: Mon, 18 Jan 2016 16:33:35 -0800 Subject: [PATCH] Revert "Honor `created()` function for an item in a submenu." This reverts commit 962308509b5452eb9e4d37badf32eedc7cc7f7b1. --- src/context-menu-manager.coffee | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/context-menu-manager.coffee b/src/context-menu-manager.coffee index 88cdc67b2..869076beb 100644 --- a/src/context-menu-manager.coffee +++ b/src/context-menu-manager.coffee @@ -136,9 +136,12 @@ class ContextMenuManager for itemSet in matchingItemSets for item in itemSet.items - itemForEvent = @cloneItemForEvent(item, event) - if itemForEvent - MenuHelpers.merge(currentTargetItems, itemForEvent, itemSet.specificity) + continue if item.devMode and not @devMode + item = Object.create(item) + if typeof item.shouldDisplay is 'function' + continue unless item.shouldDisplay(event) + item.created?(event) + MenuHelpers.merge(currentTargetItems, item, itemSet.specificity) for item in currentTargetItems MenuHelpers.merge(template, item, false) @@ -147,19 +150,6 @@ class ContextMenuManager template - # Returns an object compatible with `::add()` or `null`. - cloneItemForEvent: (item, event) -> - return null if item.devMode and not @devMode - item = Object.create(item) - if typeof item.shouldDisplay is 'function' - return null unless item.shouldDisplay(event) - item.created?(event) - if Array.isArray(item.submenu) - item.submenu = item.submenu - .map((item) => @cloneItemForEvent(item, event)) - .filter((item) -> item isnt null) - return item - convertLegacyItemsBySelector: (legacyItemsBySelector, devMode) -> itemsBySelector = {}