Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add show more/less toggle for entire threads in web UI (#6733)

Browse source 
Fix #1258
This commit is contained in:
Eugen Rochko 2018-03-11 09:52:59 +01:00 • committed by GitHub
parent f5ee2d469b
commit b6003afcdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 120 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/features/status/components/detailed_status.js
View file

@ -22,6 +22,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
status: ImmutablePropTypes.map.isRequired,
onOpenMedia: PropTypes.func.isRequired,
onOpenVideo: PropTypes.func.isRequired,
onToggleHidden: PropTypes.func.isRequired,
};
handleAccountClick = (e) => {
@ -37,6 +38,10 @@ export default class DetailedStatus extends ImmutablePureComponent {
this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), startTime);
}
handleExpandedToggle = () => {
this.props.onToggleHidden(this.props.status);
}
render () {
const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
@ -105,7 +110,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
<DisplayName account={status.get('account')} />
</a>
<StatusContent status={status} />
<StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
{media}