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

Merge remote-tracking branch 'origin/master' into mkt-url-based-command-dispatch

Browse Source
This commit is contained in:
Michelle Tilley
2017-10-03 13:16:02 -07:00
parent 0b62381d51 c9c4957921
commit 4b67353f85
33 changed files with 5275 additions and 4812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/package.coffee
View File

@@ -534,7 +534,7 @@ class Package
console.error "Error deactivating package '#{@name}'", e.stack
# We support then-able async promises as well as sync ones from deactivate
if deactivationResult?.then is 'function'
if typeof deactivationResult?.then is 'function'
deactivationResult.then => @afterDeactivation()
else
@afterDeactivation()