From 2a2858554ae4595304e146e08112cd159ab1bc14 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Mon, 10 Feb 2014 15:50:50 -0800 Subject: [PATCH] Remove synchronous package loading shims --- src/atom-package.coffee | 15 --------------- src/package-manager.coffee | 15 ++------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/atom-package.coffee b/src/atom-package.coffee index b0a187a3a..b44b4233e 100644 --- a/src/atom-package.coffee +++ b/src/atom-package.coffee @@ -73,21 +73,6 @@ class AtomPackage extends Package @activationDeferred.promise - # Deprecated - activateSync: ({immediate}={}) -> - @activateResources() - if @metadata.activationEvents? and not immediate - @subscribeToActivationEvents() - else - try - @activateConfig() - @activateStylesheets() - if @requireMainModule() - @mainModule.activate(atom.packages.getPackageState(@name) ? {}) - @mainActivated = true - catch e - console.warn "Failed to activate package named '#{@name}'", e.stack - activateNow: -> try @activateConfig() diff --git a/src/package-manager.coffee b/src/package-manager.coffee index 03052512f..52ea5fedc 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -81,26 +81,15 @@ class PackageManager @observeDisabledPackages() # Activate a single package by name - activatePackage: (name, options={}) -> - if options.sync? or options.immediate? - return @activatePackageSync(name, options) - + activatePackage: (name) -> if pack = @getActivePackage(name) Q(pack) else pack = @loadPackage(name) - pack.activate(options).then => + pack.activate().then => @activePackages[pack.name] = pack pack - # Deprecated - activatePackageSync: (name, options) -> - return pack if pack = @getActivePackage(name) - if pack = @loadPackage(name) - @activePackages[pack.name] = pack - pack.activateSync(options) - pack - # Deactivate all packages deactivatePackages: -> @deactivatePackage(pack.name) for pack in @getLoadedPackages()