moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/nsfw-hider-closing-preview' into 'develop' 

Stop click propagation when unhiding nsfw

See merge request pleroma/pleroma-fe!1245
This commit is contained in:
Shpuld Shpludson 2020-10-09 16:15:30 +00:00
parent e7a67e33ad 6cf15dce96
commit 069a4b0801
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed ### Fixed
- Fixed chats list not updating its order when new messages come in - Fixed chats list not updating its order when new messages come in
- Fixed chat messages sometimes getting lost when you receive a message at the same time - Fixed chat messages sometimes getting lost when you receive a message at the same time
- Fixed clicking NSFW hider through status popover
### Added ### Added
- Import/export a muted users - Import/export a muted users

2
src/components/attachment/attachment.vue
View File

@ -28,7 +28,7 @@
:href="attachment.url" :href="attachment.url"
:alt="attachment.description" :alt="attachment.description"
:title="attachment.description" :title="attachment.description"
@click.prevent="toggleHidden" @click.prevent.stop="toggleHidden"
> >
<img <img
:key="nsfwImage" :key="nsfwImage"