Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag '2023.11.1' into merge-upstream

Browse source
This commit is contained in:
riku6460 2023-11-17 20:13:05 +09:00
commit 455c7eb653
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
82 changed files with 2873 additions and 1843 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/frontend/src/ui/deck/column.vue
View file

@ -196,6 +196,18 @@ function getMenu() {
items = props.menu.concat(items);
}
if (props.refresher) {
items = [{
icon: 'ti ti-refresh',
text: i18n.ts.reload,
action: () => {
if (props.refresher) {
props.refresher();
}
},
}, ...items];
}
return items;
}

2
packages/frontend/src/ui/deck/direct-column.vue
View file

@ -16,7 +16,6 @@ import { } from 'vue';
import XColumn from './column.vue';
import { Column } from './deck-store.js';
import MkNotes from '@/components/MkNotes.vue';
import { reloadStream } from '@/stream.js';
defineProps<{
column: Column;
@ -36,7 +35,6 @@ const tlComponent: InstanceType<typeof MkNotes> = $ref();
function reloadTimeline() {
return new Promise<void>((res) => {
tlComponent.pagingComponent?.reload().then(() => {
reloadStream();
res();
});
});

2
packages/frontend/src/ui/deck/mentions-column.vue
View file

@ -16,7 +16,6 @@ import { } from 'vue';
import XColumn from './column.vue';
import { Column } from './deck-store.js';
import MkNotes from '@/components/MkNotes.vue';
import { reloadStream } from '@/stream.js';
defineProps<{
column: Column;
@ -28,7 +27,6 @@ const tlComponent: InstanceType<typeof MkNotes> = $ref();
function reloadTimeline() {
return new Promise<void>((res) => {
tlComponent.pagingComponent?.reload().then(() => {
reloadStream();
res();
});
});