diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index 29996f33d..6b2651ac1 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -273,9 +273,8 @@ class AtomApplication ipc.on 'cancel-window-close', => @quitting = false - clipboard = null + clipboard = require '../safe-clipboard' ipc.on 'write-text-to-selection-clipboard', (event, selectedText) -> - clipboard ?= require '../safe-clipboard' clipboard.writeText(selectedText, 'selection') # Public: Executes the given command. diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index f20e69c5a..7b0b2cb85 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -93,10 +93,9 @@ class AtomWindow hasProjectPath: -> @getLoadSettings().initialPaths?.length > 0 setupContextMenu: -> - ContextMenu = null + ContextMenu = require './context-menu' @browserWindow.on 'context-menu', (menuTemplate) => - ContextMenu ?= require './context-menu' new ContextMenu(menuTemplate, this) containsPaths: (paths) ->