diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index a427f21a6..cc5f05c1f 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -125,6 +125,7 @@ beforeEach -> afterEach -> atom.packages.deactivatePackages() atom.menu.template = [] + atom.contextMenu.clear() atom.workspaceView?.remove?() atom.workspaceView = null diff --git a/src/context-menu-manager.coffee b/src/context-menu-manager.coffee index e7ec6907f..d982537e9 100644 --- a/src/context-menu-manager.coffee +++ b/src/context-menu-manager.coffee @@ -20,18 +20,8 @@ SequenceCount = 0 module.exports = class ContextMenuManager constructor: ({@resourcePath, @devMode}) -> - @activeElement = null - @itemSets = [] @definitions = {'.overlayer': []} # TODO: Remove once color picker package stops touching private data - - @add '.workspace': [{ - label: 'Inspect Element' - command: 'application:inspect' - devMode: true - created: (event) -> - {pageX, pageY} = event - @commandOptions = {x: pageX, y: pageY} - }] + @clear() atom.keymaps.onDidLoadBundledKeymaps => @loadPlatformItems() @@ -163,6 +153,18 @@ class ContextMenuManager remote.getCurrentWindow().emit('context-menu', menuTemplate) return + clear: -> + @activeElement = null + @itemSets = [] + @add '.workspace': [{ + label: 'Inspect Element' + command: 'application:inspect' + devMode: true + created: (event) -> + {pageX, pageY} = event + @commandOptions = {x: pageX, y: pageY} + }] + class ContextMenuItemSet constructor: (@selector, @items) -> @specificity = (SpecificityCache[@selector] ?= specificity(@selector))