yume/paricafe
1
0
Fork 0
mirror of https://github.com/paricafe/misskey.git synced 2025-02-26 05:44:24 -06:00
Code Issues Projects Releases Packages Wiki Activity

avatar deco stop propagation

Browse source
This commit is contained in:
fly_mc 2024-10-17 11:11:12 +08:00
parent 658441bc3f
commit 7453ac3f80
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/pages/avatar-decorations.vue
View file

@ -33,8 +33,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.imageUrl }}</template> <template #label>{{ i18n.ts.imageUrl }}</template>
</MkInput> </MkInput>
<div class="_buttons"> <div class="_buttons">
<MkButton inline primary @click="save(avatarDecoration)"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton> <MkButton inline primary @click.stop="save(avatarDecoration)"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
<MkButton v-if="avatarDecoration.id != null" inline danger @click="del(avatarDecoration)"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton> <MkButton v-if="avatarDecoration.id != null" inline danger @click.stop="del(avatarDecoration)"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
</div> </div>
</div> </div>
</div> </div>

2
packages/frontend/src/pages/settings/avatar-decoration.decoration.vue
View file

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div <div
:class="[$style.root, { [$style.active]: active }]" :class="[$style.root, { [$style.active]: active }]"
@click="emit('click')" @click.stop="emit('click')"
> >
<div :class="$style.name"><MkCondensedLine :minScale="0.5">{{ decoration.name }}</MkCondensedLine></div> <div :class="$style.name"><MkCondensedLine :minScale="0.5">{{ decoration.name }}</MkCondensedLine></div>
<MkAvatar style="width: 60px; height: 60px;" :user="$i" :decorations="[{ url: decoration.url, angle, flipH, offsetX, offsetY }]" forceShowDecoration/> <MkAvatar style="width: 60px; height: 60px;" :user="$i" :decorations="[{ url: decoration.url, angle, flipH, offsetX, offsetY }]" forceShowDecoration/>

6
packages/frontend/src/pages/settings/avatar-decoration.dialog.vue
View file

@ -36,9 +36,9 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSpacer> </MkSpacer>
<div :class="$style.footer" class="_buttonsCenter"> <div :class="$style.footer" class="_buttonsCenter">
<MkButton v-if="usingIndex != null" primary rounded @click="update"><i class="ti ti-check"></i> {{ i18n.ts.update }}</MkButton> <MkButton v-if="usingIndex != null" primary rounded @click.stop="update"><i class="ti ti-check"></i> {{ i18n.ts.update }}</MkButton>
<MkButton v-if="usingIndex != null" rounded @click="detach"><i class="ti ti-x"></i> {{ i18n.ts.detach }}</MkButton> <MkButton v-if="usingIndex != null" rounded @click.stop="detach"><i class="ti ti-x"></i> {{ i18n.ts.detach }}</MkButton>
<MkButton v-else :disabled="exceeded" primary rounded @click="attach"><i class="ti ti-check"></i> {{ i18n.ts.attach }}</MkButton> <MkButton v-else :disabled="exceeded" primary rounded @click.stop="attach"><i class="ti ti-check"></i> {{ i18n.ts.attach }}</MkButton>
</div> </div>
</div> </div>
</MkModalWindow> </MkModalWindow>

6
packages/frontend/src/pages/settings/avatar-decoration.vue
View file

@ -22,11 +22,11 @@ SPDX-License-Identifier: AGPL-3.0-only
:offsetX="avatarDecoration.offsetX" :offsetX="avatarDecoration.offsetX"
:offsetY="avatarDecoration.offsetY" :offsetY="avatarDecoration.offsetY"
:active="true" :active="true"
@click="openDecoration(avatarDecoration, i)" @click.stop="openDecoration(avatarDecoration, i)"
/> />
</div> </div>
<MkButton danger @click="detachAllDecorations">{{ i18n.ts.detachAll }}</MkButton> <MkButton danger @click.stop="detachAllDecorations">{{ i18n.ts.detachAll }}</MkButton>
</div> </div>
<div :class="$style.decorations"> <div :class="$style.decorations">
@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
v-for="avatarDecoration in avatarDecorations" v-for="avatarDecoration in avatarDecorations"
:key="avatarDecoration.id" :key="avatarDecoration.id"
:decoration="avatarDecoration" :decoration="avatarDecoration"
@click="openDecoration(avatarDecoration)" @click.stop="openDecoration(avatarDecoration)"
/> />
</div> </div>
</div> </div>