Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-23 08:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(SFDC): properly enable SFDC

Browse source
This commit is contained in:
Evan Morikawa 2016-12-09 15:22:14 -08:00
parent a702ce9e93
commit f1befc7f3e
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/browser/package-migration-manager.es6
View file

@ -78,9 +78,12 @@ class PackageMigrationManager {
// If the old install was enabled, keep it that way
if (oldEnabledPackNames.includes(migration['old-name'])) { return }
// If we want to enable the package by default,
if (migration['enabled-by-default']) { return }
if (migration['enabled-by-default']) {
this.config.set('core.disabledPackages', disabledPackNames.filter(n => n !== migration['new-name']))
} else {
const newName = migration['new-name']
this.config.pushAtKeyPath('core.disabledPackages', newName);
}
})
this.config.set('core.packageMigrationVersion', this.version)

1
src/package-manager.coffee
View file

@ -99,6 +99,7 @@ class PackageManager
_notifyPluginsChanged: (nameData, dir) =>
names = _.pluck(nameData, "displayName")
messages = _.compact(_.pluck(nameData, "message")).map((m) => decodeURIComponent(m))
msgText = ""
if messages.length > 0
msgText = "\n\n" + messages.join("\n\n")
if names.length >= 2

2
src/pro

@ -1 +1 @@
Subproject commit de9d2e927d23a1261e297785a755c2b172fd43fb
Subproject commit 0e0f53dda987bad661a9b1ea0a3eb6ade39f0ee9