tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add polls

Browse Source 
Port front-end parts of 230a012f00 to glitch-soc
This commit is contained in:
Eugen Rochko
2019-03-03 22:18:23 +01:00
committed by Thibaut Girka
parent 0d19fcc2fb
commit 8d70a8a19b
13 changed files with 355 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/features/status/components/detailed_status.js
View File

@@ -14,6 +14,7 @@ import Video from 'flavours/glitch/features/video';
import VisibilityIcon from 'flavours/glitch/components/status_visibility_icon';
import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
import classNames from 'classnames';
import PollContainer from 'flavours/glitch/containers/poll_container';
export default class DetailedStatus extends ImmutablePureComponent {
@@ -118,7 +119,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
outerStyle.height = `${this.state.height}px`;
}
if (status.get('media_attachments').size > 0) {
if (status.get('poll')) {
media = <PollContainer pollId={status.get('poll')} />;
} else if (status.get('media_attachments').size > 0) {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
media = <AttachmentList media={status.get('media_attachments')} />;
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {