limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-25 03:17:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Fix reply and quote icons' (#10202) from Freeplay/calckey:notes into develop

Browse source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10202
This commit is contained in:
Kainoa Kanter 2023-05-26 03:16:52 +00:00
commit 2637ccf1e8
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/components/MkNoteDetailed.vue
View file

@ -71,6 +71,7 @@
class="reply"
:conversation="replies"
:detailedView="true"
:parentId="appearNote.id"
/>
<MkLoading
v-else-if="tab === 'replies' && appearNote.repliesCount > 0"
@ -84,6 +85,7 @@
class="reply"
:conversation="replies"
:detailedView="true"
:parentId="appearNote.id"
/>
<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />

4
packages/client/src/components/MkNoteSub.vue
View file

@ -28,7 +28,7 @@
<MkSubNoteContent
class="text"
:note="note"
:parentId="appearNote.parentId"
:parentId="parentId"
:conversation="conversation"
@focusfooter="footerEl.focus()"
/>
@ -140,7 +140,7 @@
:conversation="conversation"
:depth="replies.length == 1 ? depth : depth + 1"
:replyLevel="replyLevel + 1"
:parentId="appearNote.replyId"
:parentId="appearNote.id"
:detailedView="detailedView"
/>
<div v-else-if="replies.length > 0" class="more">

48
packages/client/src/components/MkSubNoteContent.vue
View file

@ -1,27 +1,26 @@
<template>
<p v-if="note.cw != null" class="cw">
<MkA
v-if="!detailed && note.replyId"
:to="`#${note.replyId}`"
v-if="
conversation &&
note.renoteId == parentId
"
:to="`#${parentId}`"
behavior="browser"
class="reply-icon"
@click.stop
>
<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
<MkA
v-if="
conversation &&
note.renoteId &&
note.renoteId != parentId &&
!note.replyId
"
:to="`/notes/${note.renoteId}`"
v-else-if="!detailed && note.replyId"
:to="`#${note.replyId}`"
behavior="browser"
v-tooltip="i18n.ts.jumpToPrevious"
class="reply-icon"
@click.stop
>
<i class="ph-quotes ph-bold ph-lg"></i>
<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
</MkA>
<Mfm
v-if="note.cw != ''"
@ -68,7 +67,19 @@
>
<template v-if="!note.cw">
<MkA
v-if="!detailed && note.replyId"
v-if="
conversation &&
note.renoteId == parentId
"
:to="`#${parentId}`"
behavior="browser"
class="reply-icon"
@click.stop
>
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
<MkA
v-else-if="!detailed && note.replyId"
:to="`#${note.replyId}`"
behavior="browser"
v-tooltip="i18n.ts.jumpToPrevious"
@ -77,19 +88,6 @@
>
<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
</MkA>
<MkA
v-if="
conversation &&
note.renoteId &&
note.renoteId != parentId &&
!note.replyId
"
:to="`/notes/${note.renoteId}`"
class="reply-icon"
@click.stop
>
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
</template>
<Mfm
v-if="note.text"