aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorrr-2016-09-10 11:22:09 +0200
committerrr-2016-09-10 11:36:51 +0200
commitad875060446b07e26bc5d6c54979c6429a9b933a (patch)
tree5a9f240537c5197e2d098c6de705dbf07cf4e09f /client
parent3149c43b7ec5daf1df5137ec0692d623c2bf3c90 (diff)
client/settings: fix updating settings
Updating settings in browsing settings view has been reseting safety settings in post list.
Diffstat (limited to 'client')
-rw-r--r--client/js/models/settings.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/js/models/settings.js b/client/js/models/settings.js
index d35a414..3a6d9e5 100644
--- a/client/js/models/settings.js
+++ b/client/js/models/settings.js
@@ -19,6 +19,7 @@ const defaultSettings = {
class Settings extends events.EventTarget {
save(newSettings, silent) {
+ newSettings = Object.assign(this.get(), newSettings);
localStorage.setItem('settings', JSON.stringify(newSettings));
if (silent !== true) {
this.dispatchEvent(new CustomEvent('change', {
@@ -30,8 +31,7 @@ class Settings extends events.EventTarget {
}
get() {
- let ret = {};
- Object.assign(ret, defaultSettings);
+ let ret = Object.assign({}, defaultSettings);
try {
Object.assign(ret, JSON.parse(localStorage.getItem('settings')));
} catch (e) {

© 2015 - 2026 Jakob L. Kreuze