diff options
author | ThibG <thib@sitedethib.com> | 2019-06-13 23:53:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-13 23:53:21 +0200 |
commit | c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f (patch) | |
tree | cf6ad8df684977b10ffd0d4a313d6dccb42ac15a /app/javascript/flavours | |
parent | 80849812d2a03ff9da671a2204bacf0c85f6ab0d (diff) | |
parent | 0fd7a8b63d6247ff1fe1d305ec712c0a519a52f1 (diff) |
Merge pull request #1111 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/boost_modal.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/boost_modal.js b/app/javascript/flavours/glitch/features/ui/components/boost_modal.js index 81bd1e576..600e4422f 100644 --- a/app/javascript/flavours/glitch/features/ui/components/boost_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/boost_modal.js @@ -7,6 +7,7 @@ import StatusContent from 'flavours/glitch/components/status_content'; import Avatar from 'flavours/glitch/components/avatar'; import RelativeTimestamp from 'flavours/glitch/components/relative_timestamp'; import DisplayName from 'flavours/glitch/components/display_name'; +import AttachmentList from 'flavours/glitch/components/attachment_list'; import ImmutablePureComponent from 'react-immutable-pure-component'; const messages = defineMessages({ @@ -75,6 +76,13 @@ export default class BoostModal extends ImmutablePureComponent { </div> <StatusContent status={status} /> + + {status.get('media_attachments').size > 0 && ( + <AttachmentList + compact + media={status.get('media_attachments')} + /> + )} </div> </div> |