aboutsummaryrefslogtreecommitdiff
path: root/src/shared/settings
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2018-01-14 09:04:30 +0900
committerShin'ya Ueoka <ueokande@i-beam.org>2018-01-14 09:08:24 +0900
commit930cd14ac1b5d25bad28084bfa953ac4a13080d1 (patch)
tree3503c7ee0fe0d7fae40ee1dc9ce59b2b2f9cfffb /src/shared/settings
parent1d85b397c9b73a8a7fa5563f2b97d5904b5af84d (diff)
fix default propertiest
Diffstat (limited to 'src/shared/settings')
-rw-r--r--src/shared/settings/storage.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shared/settings/storage.js b/src/shared/settings/storage.js
index 1edb441..25ebfcd 100644
--- a/src/shared/settings/storage.js
+++ b/src/shared/settings/storage.js
@@ -18,7 +18,9 @@ const loadValue = () => {
} else if (settings.source === 'form') {
value = settingsValues.valueFromForm(settings.form);
}
- return value;
+ return Object.assign({},
+ settingsValues.valueFromJson(DefaultSettings.json),
+ value);
});
};