From d02b740300f1a6b31cabeb862d53b6708f3ff8cc Mon Sep 17 00:00:00 2001 From: asmsuechan Date: Thu, 10 Aug 2017 16:37:31 +0900 Subject: [PATCH] Fix assignConfigValues because it didn't return proper hash object --- browser/main/lib/ConfigManager.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index 53a93a72..affba4b4 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -133,10 +133,11 @@ function set (updates) { } function assignConfigValues (config, rcConfig, originalConfig) { - config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, rcConfig, originalConfig.hotkey) - config.ui = Object.assign({}, DEFAULT_CONFIG.ui, rcConfig, originalConfig.ui) - config.editor = Object.assign({}, DEFAULT_CONFIG.editor, rcConfig, originalConfig.editor) - config.preview = Object.assign({}, DEFAULT_CONFIG.preview, rcConfig, originalConfig.preview) + config = Object.assign({}, DEFAULT_CONFIG, rcConfig, originalConfig) + config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, rcConfig.hotkey, originalConfig.hotkey) + config.ui = Object.assign({}, DEFAULT_CONFIG.ui, rcConfig.ui, originalConfig.ui) + config.editor = Object.assign({}, DEFAULT_CONFIG.editor, rcConfig.editor, originalConfig.editor) + config.preview = Object.assign({}, DEFAULT_CONFIG.preview, rcConfig.preview, originalConfig.preview) return config }