diff --git a/src/Config.js b/src/Config.js index 5e1ea7f..edb7e6f 100644 --- a/src/Config.js +++ b/src/Config.js @@ -20,19 +20,20 @@ const DEFAULT_CONFIG={ }; export function load_config() { - let config_txt=localStorage['hole_config']||'{}'; - let config; + let config=Object.assign({},DEFAULT_CONFIG); + let loaded_config; try { - config=JSON.parse(config_txt); + loaded_config=JSON.parse(localStorage['hole_config']||'{}'); } catch(e) { alert('设置加载失败,将重置为默认设置!\n'+e); delete localStorage['hole_config']; - config={}; + loaded_config={}; } - Object.keys(DEFAULT_CONFIG).forEach((key)=>{ - if(config[key]===undefined) - config[key]=DEFAULT_CONFIG[key]; + // unrecognized configs are removed + Object.keys(loaded_config).forEach((key)=>{ + if(config[key]!==undefined) + config[key]=loaded_config[key]; }); console.log('config loaded',config); @@ -208,7 +209,7 @@ export class ConfigUI extends PureComponent {