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

fix merge defect

Browse source
This commit is contained in:
riku6460 2023-12-25 19:55:56 +09:00
parent 26be9bacc8
commit 9bfe864178
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
5 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/frontend/src/components/MkAbuseReportResolver.vue
View file

@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, watch } from 'vue'; import { computed, watch, ref } from 'vue';
import MkInput from '@/components/MkInput.vue'; import MkInput from '@/components/MkInput.vue';
import MkSelect from '@/components/MkSelect.vue'; import MkSelect from '@/components/MkSelect.vue';
import MkSwitch from '@/components/MkSwitch.vue'; import MkSwitch from '@/components/MkSwitch.vue';
@ -66,7 +66,7 @@ const props = defineProps<{
previousExpiresAt?: string; previousExpiresAt?: string;
} }
}>(); }>();
let expirationDate: Date | null = $ref(null); const expirationDate = ref<Date | null>(null);
type NonNullType<T> = { type NonNullType<T> = {
[P in keyof T]: NonNullable<T[P]> [P in keyof T]: NonNullable<T[P]>
@ -105,9 +105,9 @@ const value = computed({
function renderExpirationDate(empty = false) { function renderExpirationDate(empty = false) {
if (value.value.expirationDate && !empty) { if (value.value.expirationDate && !empty) {
expirationDate = new Date(value.value.expirationDate); expirationDate.value = new Date(value.value.expirationDate);
} else { } else {
expirationDate = null; expirationDate.value = null;
} }
} }

6
packages/frontend/src/components/MkNote.vue
View file

@ -142,12 +142,6 @@ SPDX-License-Identifier: AGPL-3.0-only
</template> </template>
</I18n> </I18n>
</div> </div>
<div v-else>
<!--
MkDateSeparatedList uses TransitionGroup which requires single element in the child elements
so MkNote create empty div instead of no elements
-->
</div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>

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

@ -321,7 +321,7 @@ watch(visibility, () => {
const prepend = (item: MisskeyEntity): void => { const prepend = (item: MisskeyEntity): void => {
// 初回表示時はunshiftだけでOK // 初回表示時はunshiftだけでOK
if (!rootEl) { if (!rootEl.value) {
items.value.unshift(item); items.value.unshift(item);
return; return;
} }

6
packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
View file

@ -66,7 +66,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref, shallowRef } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import MkModalWindow from '@/components/MkModalWindow.vue'; import MkModalWindow from '@/components/MkModalWindow.vue';
import MkButton from '@/components/MkButton.vue'; import MkButton from '@/components/MkButton.vue';
@ -99,10 +99,10 @@ const emit = defineEmits<{
(ev: 'closed'): void (ev: 'closed'): void
}>(); }>();
const announceTitleEl = $shallowRef<HTMLInputElement | null>(null); const announceTitleEl = shallowRef<HTMLInputElement | null>(null);
function insertEmoji(ev: MouseEvent): void { function insertEmoji(ev: MouseEvent): void {
os.openEmojiPicker((ev.currentTarget ?? ev.target) as HTMLElement, {}, announceTitleEl); os.openEmojiPicker((ev.currentTarget ?? ev.target) as HTMLElement, {}, announceTitleEl.value);
} }
async function done(): Promise<void> { async function done(): Promise<void> {

6
packages/frontend/src/pages/settings/account-stats.vue
View file

@ -120,7 +120,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted, ref } from 'vue'; import { onMounted, ref, computed } from 'vue';
import FormSection from '@/components/form/section.vue'; import FormSection from '@/components/form/section.vue';
import MkKeyValue from '@/components/MkKeyValue.vue'; import MkKeyValue from '@/components/MkKeyValue.vue';
import * as os from '@/os.js'; import * as os from '@/os.js';
@ -140,9 +140,9 @@ onMounted(() => {
}); });
}); });
const headerActions = $computed(() => []); const headerActions = computed(() => []);
const headerTabs = $computed(() => []); const headerTabs = computed(() => []);
definePageMetadata({ definePageMetadata({
title: i18n.ts.accountInfo, title: i18n.ts.accountInfo,