moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'attachment-list-boost-modal' into 'develop' 

List attachments in reply indicator and boost modal

See merge request soapbox-pub/soapbox-fe!654
This commit is contained in:
Alex Gleason 2021-08-02 16:02:51 +00:00
parent 3b0946501d 8a406d5736
commit 29cdc4867b
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/features/compose/components/reply_indicator.js
View File

@ -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 'soapbox/components/attachment_list';
import { NavLink } from 'react-router-dom';
const messages = defineMessages({
@ -54,6 +55,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>
);
}

8
app/soapbox/features/ui/components/boost_modal.js
View File

@ -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 'soapbox/components/icon';
import AttachmentList from 'soapbox/components/attachment_list';
const messages = defineMessages({
cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Un-repost' },
@ -85,6 +86,13 @@ class BoostModal extends ImmutablePureComponent {
</div>
<StatusContent status={status} />
{status.get('media_attachments').size > 0 && (
<AttachmentList
compact
media={status.get('media_attachments')}
/>
)}
</div>
</div>