about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/status/components
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-05 22:20:58 +0100
committerGitHub <noreply@github.com>2019-03-05 22:20:58 +0100
commit772b4ba24c60e0394d25d0fad4eefb338a9befea (patch)
tree804bb8ba01b1ff55471cc558d72456d2b9d0aea9 /app/javascript/flavours/glitch/features/status/components
parent2a4ce7458a16c64029842fde210089453be2ede1 (diff)
parent866496ac16b47ee17138db600519a630be833e4e (diff)
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/status/components')
-rw-r--r--app/javascript/flavours/glitch/features/status/components/detailed_status.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.js b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
index 120ae6817..ad60320ef 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.js
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
@@ -14,6 +14,7 @@ import Video from 'flavours/glitch/features/video';
 import VisibilityIcon from 'flavours/glitch/components/status_visibility_icon';
 import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
 import classNames from 'classnames';
+import PollContainer from 'flavours/glitch/containers/poll_container';
 
 export default class DetailedStatus extends ImmutablePureComponent {
 
@@ -118,7 +119,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
-    if (status.get('media_attachments').size > 0) {
+    if (status.get('poll')) {
+      media = <PollContainer pollId={status.get('poll')} />;
+    } else if (status.get('media_attachments').size > 0) {
       if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
         media = <AttachmentList media={status.get('media_attachments')} />;
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {