From 92ec50ad4be121013a61f31105d8c5b398a4d099 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 13 Jun 2019 17:04:52 +0200 Subject: [PATCH] List attachments in reply indicator and boost modal (#10997) * Add media attachments list to boost modal * Add attachment list to reply indicator --- .../features/compose/components/reply_indicator.js | 8 ++++++++ .../mastodon/features/ui/components/boost_modal.js | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js index 142223f3d8..66dc857421 100644 --- a/app/javascript/mastodon/features/compose/components/reply_indicator.js +++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js @@ -7,6 +7,7 @@ import DisplayName from '../../../components/display_name'; import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { isRtl } from '../../../rtl'; +import AttachmentList from 'mastodon/components/attachment_list'; const messages = defineMessages({ cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' }, @@ -60,6 +61,13 @@ class ReplyIndicator extends ImmutablePureComponent {
+ + {status.get('media_attachments').size > 0 && ( + + )}
); } diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js index 4c39a60e79..70f4a1282e 100644 --- a/app/javascript/mastodon/features/ui/components/boost_modal.js +++ b/app/javascript/mastodon/features/ui/components/boost_modal.js @@ -9,6 +9,7 @@ import RelativeTimestamp from '../../../components/relative_timestamp'; import DisplayName from '../../../components/display_name'; import ImmutablePureComponent from 'react-immutable-pure-component'; import Icon from 'mastodon/components/icon'; +import AttachmentList from 'mastodon/components/attachment_list'; const messages = defineMessages({ cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' }, @@ -73,6 +74,13 @@ class BoostModal extends ImmutablePureComponent { + + {status.get('media_attachments').size > 0 && ( + + )}