yume/paricafe
1
0
Fork 0
mirror of https://github.com/paricafe/misskey.git synced 2025-01-29 16:20:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix stopPropagation

Browse source
This commit is contained in:
fly_mc 2024-10-20 13:21:21 +08:00
parent a3572cbd4a
commit 1f9f89dfbf
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,7 +100,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="isEnabledUrlPreview">
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview" @click.stop/>
</div>
<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote" @click.stop/></div>
<button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click.stop="collapsed = false">
<span :class="$style.collapsedLabel">{{ i18n.ts.showMore }}</span>
</button>

15
packages/frontend/src/components/MkNoteSimple.vue
View file

@ -7,13 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-only
<div :class="$style.root">
<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
<div :class="$style.main">
<MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
<MkNoteHeader :class="$style.header" :note="note" :mini="true" @click.stop/>
<div>
<p v-if="note.cw != null" :class="$style.cw">
<Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :isBlock="true" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis" @click.stop="defaultStore.state.clickToOpen ? noteclick(note.id) : undefined"/>
<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll"/>
<Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :isBlock="true" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis" @click.stop/>
<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll" @click.stop/>
</p>
<div v-show="note.cw == null || showContent">
<div v-show="note.cw == null || showContent" @click.stop>
<MkSubNoteContent :class="$style.text" :note="note"/>
</div>
</div>
@ -27,7 +27,6 @@ import * as Misskey from 'misskey-js';
import MkNoteHeader from '@/components/MkNoteHeader.vue';
import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
import MkCwButton from '@/components/MkCwButton.vue';
import { useRouter } from '@/router/supplier.js';
const props = defineProps<{
note: Misskey.entities.Note;
@ -35,12 +34,6 @@ const props = defineProps<{
const showContent = ref(false);
function noteclick(id: string) {
const selection = document.getSelection();
if (selection?.toString().length === 0) {
useRouter().push(`/notes/${id}`);
}
}
</script>
<style lang="scss" module>

1
packages/frontend/src/components/global/MkAvatar.vue
View file

@ -89,6 +89,7 @@ const url = computed(() => {
function onClick(ev: MouseEvent): void {
if (props.link) return;
ev.stopPropagation();
emit('click', ev);
}