Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-11-11 10:12:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(win): load config earlier

Browse source
This commit is contained in:
Evan Morikawa 2016-04-22 14:57:33 -07:00
parent e90735ed6e
commit 78b19a4d42
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
keymaps/base-win32.cson
View file

@ -6,3 +6,6 @@
'body': 'body':
'F11': 'window:toggle-full-screen' 'F11': 'window:toggle-full-screen'
'ctrl-shift-F10': 'window:show-work-window'
'ctrl-shift-F11': 'window:reload'
'ctrl-shift-F12': 'window:toggle-dev-tools'

2
src/nylas-env.coffee
View file

@ -661,10 +661,10 @@ class NylasEnvConstructor extends Model
@savedState.columnWidths[id] @savedState.columnWidths[id]
startWindow: -> startWindow: ->
@loadConfig()
{packageLoadingDeferred, windowType} = @getLoadSettings() {packageLoadingDeferred, windowType} = @getLoadSettings()
@extendRxObservables() @extendRxObservables()
StoreRegistry.activateAllStores() StoreRegistry.activateAllStores()
@loadConfig()
@keymaps.loadBundledKeymaps() @keymaps.loadBundledKeymaps()
@themes.loadBaseStylesheets() @themes.loadBaseStylesheets()
@packages.loadPackages(windowType) unless packageLoadingDeferred @packages.loadPackages(windowType) unless packageLoadingDeferred