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

Merge branch 'develop' into feat-1714

Browse source
This commit is contained in:
かっこかり 2024-07-25 17:42:47 +09:00 • committed by GitHub
commit fa356fa149
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 212 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkPollEditor.vue
View file

@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkInput>
</section>
<section v-else-if="expiration === 'after'">
<MkInput v-model="after" small type="number" class="input">
<MkInput v-model="after" small type="number" min="1" class="input">
<template #label>{{ i18n.ts._poll.duration }}</template>
</MkInput>
<MkSelect v-model="unit" small>

1
packages/frontend/src/components/MkReactionsViewer.details.vue
View file

@ -81,6 +81,7 @@ function getReactionName(reaction: string): string {
}
.user {
display: flex;
line-height: 24px;
padding-top: 4px;
white-space: nowrap;

2
packages/frontend/src/components/global/RouterView.vue
View file

@ -53,7 +53,7 @@ function resolveNested(current: Resolved, d = 0): Resolved | null {
const current = resolveNested(router.current)!;
const currentPageComponent = shallowRef('component' in current.route ? current.route.component : MkLoadingPage);
const currentPageProps = ref(current.props);
const key = ref(current.route.path + JSON.stringify(Object.fromEntries(current.props)));
const key = ref(router.getCurrentKey() + JSON.stringify(Object.fromEntries(current.props)));
function onChange({ resolved, key: newKey }) {
const current = resolveNested(resolved);