diff --git a/src/atom.coffee b/src/atom.coffee index 8d5053254..c515f26be 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -280,7 +280,7 @@ class Atom extends Model deprecate "The atom.syntax global is deprecated. Use atom.grammars instead." @grammars - @subscribe @packages.onDidActivateAll => @watchThemes() + @subscribe @packages.onDidActivateInitialPackages => @watchThemes() Project = require './project' TextBuffer = require 'text-buffer' diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee index bb4bfb2af..2c022cc32 100644 --- a/src/menu-manager.coffee +++ b/src/menu-manager.coffee @@ -61,7 +61,7 @@ class MenuManager @pendingUpdateOperation = null @template = [] atom.keymaps.onDidLoadBundledKeymaps => @loadPlatformItems() - atom.packages.onDidActivateAll => @sortPackagesMenu() + atom.packages.onDidActivateInitialPackages => @sortPackagesMenu() # Public: Adds the given items to the application menu. # diff --git a/src/package-manager.coffee b/src/package-manager.coffee index e9064e01e..e3cc1c2a2 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -65,15 +65,19 @@ class PackageManager # * `callback` {Function} # # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe. + onDidActivateInitialPackages: (callback) -> + @emitter.on 'did-activate-initial-packages', callback + onDidActivateAll: (callback) -> - @emitter.on 'did-activate-all', callback + Grim.deprecate("Use `::onDidActivateInitialPackages` instead.") + @onDidActivateInitialPackages(callback) on: (eventName) -> switch eventName when 'loaded' deprecate 'Use PackageManager::onDidLoadAll instead' when 'activated' - deprecate 'Use PackageManager::onDidActivateAll instead' + deprecate 'Use PackageManager::onDidActivateInitialPackages instead' else deprecate 'PackageManager::on is deprecated. Use event subscription methods instead.' EmitterMixin::on.apply(this, arguments) @@ -325,7 +329,7 @@ class PackageManager packages = @getLoadedPackagesForTypes(types) activator.activatePackages(packages) @emit 'activated' - @emitter.emit 'did-activate-all' + @emitter.emit 'did-activate-initial-packages' # another type of package manager can handle other package types. # See ThemeManager