Merge remote-tracking branch 'upstream/develop' into birthdays

1 files changed, 9 insertions, 0 deletions

diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
index 353e551c..2e6992cb 100644
--- a/src/components/settings_modal/helpers/boolean_setting.js
+++ b/src/components/settings_modal/helpers/boolean_setting.js
@@ -41,7 +41,16 @@ export default {
   },
   methods: {
     update (e) {
+      const [firstSegment, ...rest] = this.path.split('.')
       set(this.$parent, this.path, e)
+      // Updating nested properties does not trigger update on its parent.
+      // probably still not as reliable, but works for depth=1 at least
+      if (rest.length > 0) {
+        set(this.$parent, firstSegment, { ...get(this.$parent, firstSegment) })
+      }
+    },
+    reset () {
+      set(this.$parent, this.path, this.defaultState)
     }
   }
 }