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

Merge branch 'add-images-to-polls' into 'develop' 

Add uploads to polls

See merge request soapbox-pub/soapbox-fe!113
This commit is contained in:
Alex Gleason 2020-07-28 19:27:05 +00:00
parent 5333680a32 1329ca3578
commit 7342325e23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/soapbox/actions/compose.js
View File

@ -228,11 +228,6 @@ export function uploadCompose(files) {
return; return;
} }
if (getState().getIn(['compose', 'poll'])) {
dispatch(showAlert(undefined, messages.uploadErrorPoll));
return;
}
dispatch(uploadComposeRequest()); dispatch(uploadComposeRequest());
for (const [i, f] of Array.from(files).entries()) { for (const [i, f] of Array.from(files).entries()) {

7
app/soapbox/components/status.js
View File

@ -265,6 +265,7 @@ class Status extends ImmutablePureComponent {
render() { render() {
let media = null; let media = null;
let poll = null;
let statusAvatar, prepend, rebloggedByText, reblogContent; let statusAvatar, prepend, rebloggedByText, reblogContent;
const { intl, hidden, featured, otherAccounts, unread, showThread, group } = this.props; const { intl, hidden, featured, otherAccounts, unread, showThread, group } = this.props;
@ -332,8 +333,9 @@ class Status extends ImmutablePureComponent {
} }
if (status.get('poll')) { if (status.get('poll')) {
media = <PollContainer pollId={status.get('poll')} />; poll = <PollContainer pollId={status.get('poll')} />;
} else if (status.get('media_attachments').size > 0) { }
if (status.get('media_attachments').size > 0) {
if (this.props.muted) { if (this.props.muted) {
media = ( media = (
<AttachmentList <AttachmentList
@ -473,6 +475,7 @@ class Status extends ImmutablePureComponent {
/> />
{media} {media}
{poll}
{showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) && ( {showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) && (
<button className='status__content__read-more-button' onClick={this.handleClick}> <button className='status__content__read-more-button' onClick={this.handleClick}>

1
app/soapbox/features/compose/containers/upload_button_container.js
View File

@ -4,7 +4,6 @@ import { uploadCompose } from '../../../actions/compose';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 3 || state.getIn(['compose', 'media_attachments']).some(m => m.get('type') === 'video')), disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 3 || state.getIn(['compose', 'media_attachments']).some(m => m.get('type') === 'video')),
unavailable: state.getIn(['compose', 'poll']) !== null,
resetFileKey: state.getIn(['compose', 'resetFileKey']), resetFileKey: state.getIn(['compose', 'resetFileKey']),
}); });

7
app/soapbox/features/status/components/detailed_status.js
View File

@ -91,6 +91,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
} }
let media = ''; let media = '';
let poll = '';
let statusTypeIcon = ''; let statusTypeIcon = '';
if (this.props.measureHeight) { if (this.props.measureHeight) {
@ -98,8 +99,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
} }
if (status.get('poll')) { if (status.get('poll')) {
media = <PollContainer pollId={status.get('poll')} />; poll = <PollContainer pollId={status.get('poll')} />;
} else if (status.get('media_attachments').size > 0) { }
if (status.get('media_attachments').size > 0) {
if (status.getIn(['media_attachments', 0, 'type']) === 'video') { if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
const video = status.getIn(['media_attachments', 0]); const video = status.getIn(['media_attachments', 0]);
@ -172,6 +174,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
<StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} /> <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
{media} {media}
{poll}
<div className='detailed-status__meta'> <div className='detailed-status__meta'>
<StatusInteractionBar status={status} /> <StatusInteractionBar status={status} />