diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-01-15 16:32:24 +0000 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2023-01-15 16:32:24 +0000 |
| commit | 9385767b12d2c609dd513580852fffd33b41854f (patch) | |
| tree | 3e597f470a26c263ee84d5d74565b4122d3506de /packages/frontend/src/components | |
| parent | fix(client): Fix #9600 chat paging issue (diff) | |
| download | misskey-9385767b12d2c609dd513580852fffd33b41854f.tar.gz misskey-9385767b12d2c609dd513580852fffd33b41854f.tar.bz2 misskey-9385767b12d2c609dd513580852fffd33b41854f.zip | |
fix(client): add :disable-link="true" to some <MkAvatar /> Fix #9606
Diffstat (limited to 'packages/frontend/src/components')
4 files changed, 7 insertions, 7 deletions
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 94dabcac90..5db5158557 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -17,7 +17,7 @@ </span> <MkA v-else-if="item.type === 'link'" :to="item.to" :tabindex="i" class="_button" :class="$style.item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)"> <i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i> - <MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar"/> + <MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar" :disable-link="true"/> <span>{{ item.text }}</span> <span v-if="item.indicate" :class="$style.indicator"><i class="_indicatorCircle"></i></span> </MkA> @@ -27,7 +27,7 @@ <span v-if="item.indicate" :class="$style.indicator"><i class="_indicatorCircle"></i></span> </a> <button v-else-if="item.type === 'user'" :tabindex="i" class="_button" :class="[$style.item, { [$style.active]: item.active }]" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)"> - <MkAvatar :user="item.user" :class="$style.avatar"/><MkUserName :user="item.user"/> + <MkAvatar :user="item.user" :class="$style.avatar" :disable-link="true"/><MkUserName :user="item.user"/> <span v-if="item.indicate" :class="$style.indicator"><i class="_indicatorCircle"></i></span> </button> <span v-else-if="item.type === 'switch'" :tabindex="i" :class="$style.item" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)"> @@ -40,7 +40,7 @@ </button> <button v-else :tabindex="i" class="_button" :class="[$style.item, { [$style.danger]: item.danger, [$style.active]: item.active }]" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)"> <i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i> - <MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar"/> + <MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar" :disable-link="true"/> <span>{{ item.text }}</span> <span v-if="item.indicate" :class="$style.indicator"><i class="_indicatorCircle"></i></span> </button> diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 6822caf4f4..24ac380d17 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -9,7 +9,7 @@ <header :class="$style.header"> <button v-if="!fixed" :class="$style.cancel" class="_button" @click="cancel"><i class="ti ti-x"></i></button> <button v-click-anime v-tooltip="i18n.ts.switchAccount" :class="$style.account" class="_button" @click="openAccountMenu"> - <MkAvatar :user="postAccount ?? $i" :class="$style.avatar"/> + <MkAvatar :user="postAccount ?? $i" :class="$style.avatar" :disable-link="true" /> </button> <div :class="$style.headerRight"> <span :class="[$style.textCount, { [$style.textOver]: textLength > maxTextLength }]">{{ maxTextLength - textLength }}</span> diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue index b4210be911..0ada1ac4d0 100644 --- a/packages/frontend/src/components/MkReactionsViewer.details.vue +++ b/packages/frontend/src/components/MkReactionsViewer.details.vue @@ -7,7 +7,7 @@ </div> <div :class="$style.users"> <div v-for="u in users" :key="u.id" :class="$style.user"> - <MkAvatar :class="$style.avatar" :user="u"/> + <MkAvatar :class="$style.avatar" :user="u" :disable-link="true"/> <MkUserName :user="u" :nowrap="true"/> </div> <div v-if="users.length > 10">+{{ count - 10 }}</div> diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue index 7f5658ee13..f55c4f6a75 100644 --- a/packages/frontend/src/components/global/MkPageHeader.vue +++ b/packages/frontend/src/components/global/MkPageHeader.vue @@ -1,11 +1,11 @@ <template> <div v-if="show" ref="el" :class="[$style.root, { [$style.slim]: narrow, [$style.thin]: thin_ }]" :style="{ background: bg }" @click="onClick"> <div v-if="narrow" :class="$style.buttonsLeft"> - <MkAvatar v-if="props.displayMyAvatar && $i" :class="$style.avatar" :user="$i" :disable-preview="true"/> + <MkAvatar v-if="props.displayMyAvatar && $i" :class="$style.avatar" :user="$i" :disable-preview="true" :disable-link="true"/> </div> <template v-if="metadata"> <div v-if="!hideTitle" :class="$style.titleContainer" @click="showTabsPopup"> - <MkAvatar v-if="metadata.avatar" :class="$style.titleAvatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true"/> + <MkAvatar v-if="metadata.avatar" :class="$style.titleAvatar" :user="metadata.avatar" :disable-preview="true" :show-indicator="true" :disable-link="true"/> <i v-else-if="metadata.icon" :class="[$style.titleIcon, metadata.icon]"></i> <div :class="$style.title"> |