Merge pull request #309 from ueokande/default-properties

Default properties

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": {
   }
-  }
 }`,
 };

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