pleroma-fe

commit: 069a4b0801b074b323359db1a7e55a9f0035480c
parent e7a67e33addb4241957fb60d970f3c15020cd88b
Author: Shpuld Shpludson <shp@cock.li>
Date:   Fri,  9 Oct 2020 16:15:30 +0000

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

Stop click propagation when unhiding nsfw

See merge request pleroma/pleroma-fe!1245
Diffstat:
M
CHANGELOG.md
1
+
M
src/components/attachment/attachment.vue
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - 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 clicking NSFW hider through status popover
 
 ### Added
 - Import/export a muted users
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
@@ -28,7 +28,7 @@
       :href="attachment.url"
       :alt="attachment.description"
       :title="attachment.description"
-      @click.prevent="toggleHidden"
+      @click.prevent.stop="toggleHidden"
     >
       <img
         :key="nsfwImage"