public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 02:06:29 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into date-iso8601

Browse Source
This commit is contained in:
Junyoung Choi
2020-07-20 19:42:08 +09:00
parent d1a81984fb fae91255f9
commit ce81b26d1d
13 changed files with 420 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
browser/main/lib/ConfigManager.js
View File

@@ -139,7 +139,10 @@ export const DEFAULT_CONFIG = {
username: '',
password: ''
},
coloredTags: {}
coloredTags: {},
wakatime: {
key: null
}
}
function validate(config) {
@@ -255,6 +258,12 @@ function assignConfigValues(originalConfig, rcConfig) {
originalConfig.hotkey,
rcConfig.hotkey
)
config.wakatime = Object.assign(
{},
DEFAULT_CONFIG.wakatime,
originalConfig.wakatime,
rcConfig.wakatime
)
config.blog = Object.assign(
{},
DEFAULT_CONFIG.blog,