pleroma-fe

commit: acc45b49a55a5c173abdeac8c89d16395f92bc01
parent 39f8587171d3a6974f5c51c829cb09c8c9dbc065
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Mon, 31 Aug 2020 12:30:29 +0000

Merge branch 'fix/hide-polls-in-collapsed-posts' into 'develop'

hide poll when subject collapsed, fix #683

Closes #683

See merge request pleroma/pleroma-fe!1220
Diffstat:
M
CHANGELOG.md
2
++
M
src/components/status_content/status_content.vue
6
+++++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ## [Unreleased patch]
+### Changed
+- Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
 
 ## [2.1.0] - 2020-08-28
 ### Added
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
@@ -72,6 +72,10 @@
           class="icon-doc"
         />
         <span
+          v-if="status.poll && status.poll.options"
+          class="icon-chart-bar"
+        />
+        <span
           v-if="status.card"
           class="icon-link"
         />
@@ -86,7 +90,7 @@
       </a>
     </div>
 
-    <div v-if="status.poll && status.poll.options">
+    <div v-if="status.poll && status.poll.options && !hideSubjectStatus">
       <poll :base-poll="status.poll" />
     </div>