diff options
author | ThibG <thib@sitedethib.com> | 2019-06-13 17:04:52 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-13 17:04:52 +0200 |
commit | dd45c63921f6f64096fa6a1693cc84d6aa33c54f (patch) | |
tree | 5b24c64dbce5848bcebede82cd792d9779a47663 | |
parent | 917f0ea6196c975ef82138a8cbecbaeab885eb03 (diff) |
List attachments in reply indicator and boost modal (#10997)
* Add media attachments list to boost modal * Add attachment list to reply indicator
-rw-r--r-- | app/javascript/mastodon/features/compose/components/reply_indicator.js | 8 | ||||
-rw-r--r-- | app/javascript/mastodon/features/ui/components/boost_modal.js | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js index 142223f3d..66dc85742 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 { </div> <div className='reply-indicator__content' style={style} dangerouslySetInnerHTML={content} /> + + {status.get('media_attachments').size > 0 && ( + <AttachmentList + compact + media={status.get('media_attachments')} + /> + )} </div> ); } diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js index 4c39a60e7..70f4a1282 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 { </div> <StatusContent status={status} /> + + {status.get('media_attachments').size > 0 && ( + <AttachmentList + compact + media={status.get('media_attachments')} + /> + )} </div> </div> |