Fix dev mode

This commit is contained in:
Antonio Scandurra
2017-03-11 18:50:13 +01:00
parent 05eb737a94
commit 8bd409ede3
2 changed files with 11 additions and 3 deletions

View File

@@ -187,7 +187,9 @@ class AtomEnvironment extends Model
@autoUpdater = new AutoUpdateManager({@applicationDelegate})
@keymaps.loadBundledKeymaps()
if @keymaps.canLoadBundledKeymapsFromMemory()
@keymaps.loadBundledKeymaps()
@registerDefaultCommands()
@registerDefaultOpeners()
@registerDefaultDeserializers()
@@ -217,8 +219,13 @@ class AtomEnvironment extends Model
}
@config.initialize({@configDirPath, resourcePath, projectHomeSchema: ConfigSchema.projectHome})
@menu.initialize({resourcePath})
@contextMenu.initialize({resourcePath, devMode})
@keymaps.configDirPath = @configDirPath
@keymaps.resourcePath = resourcePath
unless @keymaps.canLoadBundledKeymapsFromMemory()
@keymaps.loadBundledKeymaps()
@commands.attach(@window)
@@ -226,8 +233,6 @@ class AtomEnvironment extends Model
@packages.initialize({devMode, @configDirPath, resourcePath, safeMode})
@themes.initialize({@configDirPath, resourcePath, safeMode})
@menu.initialize({resourcePath})
@contextMenu.initialize({resourcePath, devMode})
@commandInstaller.initialize(@getVersion())
@workspace.initialize()
@autoUpdater.initialize()

View File

@@ -11,6 +11,9 @@ KeymapManager::onDidLoadBundledKeymaps = (callback) ->
KeymapManager::onDidLoadUserKeymap = (callback) ->
@emitter.on 'did-load-user-keymap', callback
KeymapManager::canLoadBundledKeymapsFromMemory = ->
bundledKeymaps?
KeymapManager::loadBundledKeymaps = ->
if bundledKeymaps?
for keymapName, keymap of bundledKeymaps