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

Change variable names

Browse Source
This commit is contained in:
asmsuechan
2017-08-10 23:30:42 +09:00
parent 6e2e48fa64
commit 821a7c780e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,14 +60,13 @@ function _save (config) {
} }
function get () { function get () {
const storedConfig = window.localStorage.getItem('config') const rawStoredConfig = window.localStorage.getItem('config')
const storedConfig = Object.assign({}, DEFAULT_CONFIG, JSON.parse(rawStoredConfig))
let config = storedConfig let config = storedConfig
try { try {
const boostnotercConfig = RcParser.parse() const boostnotercConfig = RcParser.parse()
config = assignConfigValues(storedConfig, boostnotercConfig)
config = Object.assign({}, DEFAULT_CONFIG, JSON.parse(storedConfig))
config = assignConfigValues(config, boostnotercConfig)
if (!validate(config)) throw new Error('INVALID CONFIG') if (!validate(config)) throw new Error('INVALID CONFIG')
} catch (err) { } catch (err) {