mirror of
https://codeberg.org/yeentown/barkey.git
synced 2025-07-07 20:44:34 +00:00
Merge branch 'develop' into merge/2025-03-24
# Conflicts: # packages/frontend/src/pages/timeline.vue
This commit is contained in:
commit
f840b75fe2
1 changed files with 3 additions and 3 deletions
|
@ -71,7 +71,7 @@ router.useListener('same', () => {
|
||||||
type TimelinePageSrc = BasicTimelineType | `list:${string}`;
|
type TimelinePageSrc = BasicTimelineType | `list:${string}`;
|
||||||
|
|
||||||
const queue = ref(0);
|
const queue = ref(0);
|
||||||
const srcWhenNotSignin = ref<'local' | 'global'>(isAvailableBasicTimeline('local') ? 'local' : 'global');
|
const srcWhenNotSignin = ref<'local' | 'bubble' | 'global'>(isAvailableBasicTimeline('local') ? 'local' : 'global');
|
||||||
const src = computed<TimelinePageSrc>({
|
const src = computed<TimelinePageSrc>({
|
||||||
get: () => ($i ? store.r.tl.value.src : srcWhenNotSignin.value),
|
get: () => ($i ? store.r.tl.value.src : srcWhenNotSignin.value),
|
||||||
set: (x) => saveSrc(x),
|
set: (x) => saveSrc(x),
|
||||||
|
@ -215,8 +215,8 @@ function saveSrc(newSrc: TimelinePageSrc): void {
|
||||||
}
|
}
|
||||||
|
|
||||||
store.set('tl', out);
|
store.set('tl', out);
|
||||||
if (['local', 'global'].includes(newSrc)) {
|
if (['local', 'bubble', 'global'].includes(newSrc)) {
|
||||||
srcWhenNotSignin.value = newSrc as 'local' | 'global';
|
srcWhenNotSignin.value = newSrc as 'local' | 'bubble' | 'global';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue