github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Preload settings

Browse Source
This commit is contained in:
Antonio Scandurra
2017-03-23 15:23:14 +01:00
parent ab1411b1d7
commit 974e1b7f4a
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/package.coffee
View File

@@ -89,11 +89,11 @@ class Package
@registerTranspilerConfig()
@configSchemaRegisteredOnLoad = @registerConfigSchemaFromMetadata()
@requireMainModule()
@settingsPromise = @loadSettings()
finishLoading: ->
@measure 'loadTime', =>
@loadStylesheets()
@settingsPromise = @loadSettings()
load: ->
@measure 'loadTime', =>
@@ -468,15 +468,18 @@ class Package
new Promise (resolve) =>
if @bundledPackage and not @packageManager.devMode
settingsDirPath = path.resolve(@packageManager.resourcePath, @path, 'settings')
for settingsPath, scopedProperties of @packageManager.packagesCache[@name].settings
settings = new ScopedProperties("core/#{settingsPath}", scopedProperties ? {}, @config)
@settings.push(settings)
settings.activate() if @settingsActivated
resolve()
else
settingsDirPath = path.join(@path, 'settings')
fs.exists settingsDirPath, (settingsDirExists) ->
return resolve() unless settingsDirExists
fs.exists settingsDirPath, (settingsDirExists) ->
return resolve() unless settingsDirExists
fs.list settingsDirPath, ['json', 'cson'], (error, settingsPaths=[]) ->
async.each settingsPaths, loadSettingsFile, -> resolve()
fs.list settingsDirPath, ['json', 'cson'], (error, settingsPaths=[]) ->
async.each settingsPaths, loadSettingsFile, -> resolve()
serialize: ->
if @mainActivated