fix: move timezone cookie parsing from mounted to fetch

kernoeb · Oct 16, 2024 · db4dc0a · db4dc0a
1 parent 29615f3
commit db4dc0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/components/DialogSettings.vue b/components/DialogSettings.vue
@@ -272,7 +272,7 @@
             class="mb-2"
           >
             <v-list-item-content class="pt-0">
-              <LazyTimezoneSelector @fetch="delayedFetch" />
+              <lazy-timezone-selector @fetch="delayedFetch" />
             </v-list-item-content>
           </v-list-item>
 

diff --git a/components/TimezoneSelector.vue b/components/TimezoneSelector.vue
@@ -133,7 +133,3 @@ export default {
   }
 }
 </script>
-
-<style>
-
-</style>
diff --git a/pages/index.vue b/pages/index.vue
@@ -436,6 +436,19 @@ export default {
       return
     }
 
+    if (this.$cookies.get('timezone') !== undefined) {
+      try {
+        const tmp = this.$cookies.get('timezone', { parseJSON: true })
+        if (tmp && Object.keys(tmp).length > 0 && tmp.target && tmp.browser) {
+          this.localeUtils = tmp
+        } else {
+          this.$cookies.remove('timezone')
+        }
+      } catch (e) {
+        this.$cookies.remove('timezone')
+      }
+    }
+
     try {
       await this.getEvents()
     } catch (e) {
@@ -453,6 +466,8 @@ export default {
       }
     }
 
+    this.updateTime()
+
     this.loading = false
   },
   computed: {
@@ -512,19 +527,6 @@ export default {
       }, { maxAge: 2147483646 })
     }
 
-    if (this.$cookies.get('timezone') !== undefined) {
-      try {
-        const tmp = this.$cookies.get('timezone', { parseJSON: true })
-        if (tmp && Object.keys(tmp).length > 0 && tmp.target && tmp.browser) {
-          this.localeUtils = tmp
-        } else {
-          this.$cookies.remove('timezone')
-        }
-      } catch (e) {
-        this.$cookies.remove('timezone')
-      }
-    }
-
     this.$nextTick(function () {
       try {
         const start = this.$moment(this.$refs.calendar.start).week().toString()
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,7 +133,3 @@ export default { @@
       }
     }
     </script>
-    <style>
-    </style>