Merge pull request #309 from ueokande/default-properties

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

@ -60,9 +60,9 @@ export default {
"duckduckgo": "https://duckduckgo.com/?q={}",
"twitter": "https://twitter.com/search?q={}",
"wikipedia": "https://en.wikipedia.org/w/index.php?search={}"
}
},
"properties": {
}
}
}`,
};

@ -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);
});
};