public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

Fix assignConfigValues because it didn't return proper hash object

Browse Source
This commit is contained in:
asmsuechan
2017-08-10 16:37:31 +09:00
parent 9cb443dc2f
commit d02b740300
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,10 +133,11 @@ function set (updates) {
} }
function assignConfigValues (config, rcConfig, originalConfig) { function assignConfigValues (config, rcConfig, originalConfig) {
config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, rcConfig, originalConfig.hotkey) config = Object.assign({}, DEFAULT_CONFIG, rcConfig, originalConfig)
config.ui = Object.assign({}, DEFAULT_CONFIG.ui, rcConfig, originalConfig.ui) config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, rcConfig.hotkey, originalConfig.hotkey)
config.editor = Object.assign({}, DEFAULT_CONFIG.editor, rcConfig, originalConfig.editor) config.ui = Object.assign({}, DEFAULT_CONFIG.ui, rcConfig.ui, originalConfig.ui)
config.preview = Object.assign({}, DEFAULT_CONFIG.preview, rcConfig, originalConfig.preview) config.editor = Object.assign({}, DEFAULT_CONFIG.editor, rcConfig.editor, originalConfig.editor)
config.preview = Object.assign({}, DEFAULT_CONFIG.preview, rcConfig.preview, originalConfig.preview)
return config return config
} }