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

Call AtomPackage::activateConfig from AtomPackage::activateNow

Browse Source 
Previously this method was unused and so packages implementing
activateConfig were not being called.
This commit is contained in:
Kevin Sawicki
2013-08-22 10:15:06 -07:00
parent 13f35bc6e3
commit 25be233c5f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/atom-package.coffee
View File

@@ -43,17 +43,19 @@ class AtomPackage extends Package
activateNow: ->
try
if @requireMainModule()
config.setDefaults(@name, @mainModule.configDefaults)
@mainModule.activate(atom.getPackageState(@name) ? {})
@activateConfig()
@mainModule.activate(atom.getPackageState(@name) ? {}) if @requireMainModule()
catch e
console.warn "Failed to activate package named '#{@name}'", e.stack
activateConfig: ->
@activateResources()
if @requireMainModule()
return if @configActivated
@requireMainModule()
if @mainModule?
config.setDefaults(@name, @mainModule.configDefaults)
@mainModule?.activateConfig?()
@mainModule.activateConfig?()
@configActivated = true
activateResources: ->
keymap.add(keymapPath, map) for [keymapPath, map] in @keymaps
@@ -123,7 +125,7 @@ class AtomPackage extends Package
applyStylesheet(stylesheetPath, content) for [stylesheetPath, content] in @stylesheets
requireMainModule: ->
return @mainModule if @mainModule
return @mainModule if @mainModule?
mainModulePath = @getMainModulePath()
@mainModule = require(mainModulePath) if fsUtils.isFileSync(mainModulePath)