Merge pull request #309 from ueokande/default-properties

Default properties

2 files changed, 5 insertions, 3 deletions

diff --git a/src/shared/settings/default.js b/src/shared/settings/default.js
index 0c3f0d9..bcd7731 100644
--- a/src/shared/settings/default.js
+++ b/src/shared/settings/default.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": {
     }
+  },
+  "properties": {
   }
 }`,
 };
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);
   });
 };