natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix #10236

This commit is contained in:
Freeplay 2023-05-31 17:02:58 -04:00
parent 0663a67b86
commit f3bdce0636
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/components/MkNote.vue
View File

@ -9,6 +9,7 @@
class="tkcbzcuz note-container" class="tkcbzcuz note-container"
:tabindex="!isDeleted ? '-1' : null" :tabindex="!isDeleted ? '-1' : null"
:class="{ renote: isRenote }" :class="{ renote: isRenote }"
:id="appearNote.id"
> >
<MkNoteSub <MkNoteSub
v-if="appearNote.reply && !detailedView" v-if="appearNote.reply && !detailedView"

1
packages/client/src/components/MkNoteSub.vue
View File

@ -30,6 +30,7 @@
:note="note" :note="note"
:parentId="parentId" :parentId="parentId"
:conversation="conversation" :conversation="conversation"
:detailedView="detailedView"
@focusfooter="footerEl.focus()" @focusfooter="footerEl.focus()"
/> />
<div v-if="translating || translation" class="translation"> <div v-if="translating || translation" class="translation">

10
packages/client/src/components/MkSubNoteContent.vue
View File

@ -2,7 +2,7 @@
<p v-if="note.cw != null" class="cw"> <p v-if="note.cw != null" class="cw">
<MkA <MkA
v-if="conversation && note.renoteId == parentId" v-if="conversation && note.renoteId == parentId"
:to="`#${parentId}`" :to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
behavior="browser" behavior="browser"
class="reply-icon" class="reply-icon"
@click.stop @click.stop
@ -11,7 +11,7 @@
</MkA> </MkA>
<MkA <MkA
v-else-if="!detailed && note.replyId" v-else-if="!detailed && note.replyId"
:to="`#${note.replyId}`" :to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
behavior="browser" behavior="browser"
v-tooltip="i18n.ts.jumpToPrevious" v-tooltip="i18n.ts.jumpToPrevious"
class="reply-icon" class="reply-icon"
@ -66,7 +66,7 @@
<template v-if="!note.cw"> <template v-if="!note.cw">
<MkA <MkA
v-if="conversation && note.renoteId == parentId" v-if="conversation && note.renoteId == parentId"
:to="`#${parentId}`" :to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
behavior="browser" behavior="browser"
class="reply-icon" class="reply-icon"
@click.stop @click.stop
@ -75,7 +75,7 @@
</MkA> </MkA>
<MkA <MkA
v-else-if="!detailed && note.replyId" v-else-if="!detailed && note.replyId"
:to="`#${note.replyId}`" :to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
behavior="browser" behavior="browser"
v-tooltip="i18n.ts.jumpToPrevious" v-tooltip="i18n.ts.jumpToPrevious"
class="reply-icon" class="reply-icon"
@ -173,11 +173,13 @@ import MkUrlPreview from "@/components/MkUrlPreview.vue";
import XShowMoreButton from "@/components/MkShowMoreButton.vue"; import XShowMoreButton from "@/components/MkShowMoreButton.vue";
import XCwButton from "@/components/MkCwButton.vue"; import XCwButton from "@/components/MkCwButton.vue";
import MkButton from "@/components/MkButton.vue"; import MkButton from "@/components/MkButton.vue";
import { notePage } from "@/filters/note";
import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm"; import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
import { extractMfmWithAnimation } from "@/scripts/extract-mfm"; import { extractMfmWithAnimation } from "@/scripts/extract-mfm";
import { i18n } from "@/i18n"; import { i18n } from "@/i18n";
import { defaultStore } from "@/store"; import { defaultStore } from "@/store";
const props = defineProps<{ const props = defineProps<{
note: misskey.entities.Note; note: misskey.entities.Note;
parentId?; parentId?;