Merge pull request #320 from ueokande/configuration-compatible

set default properties
jh-changes
Shin'ya Ueoka 7 years ago committed by GitHub
commit f58fa44cb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/shared/settings/storage.js

@ -18,6 +18,9 @@ const loadValue = () => {
} else if (settings.source === 'form') { } else if (settings.source === 'form') {
value = settingsValues.valueFromForm(settings.form); value = settingsValues.valueFromForm(settings.form);
} }
if (!value.properties) {
value.properties = {};
}
return Object.assign({}, return Object.assign({},
settingsValues.valueFromJson(DefaultSettings.json), settingsValues.valueFromJson(DefaultSettings.json),
value); value);