mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reblog support for collapsed toots

pull/18/merge
Gô Shoemake 2017-06-23 18:01:29 -07:00 committed by kibigo!
parent 453b9c6e7e
commit 67adbcc60c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/components/status.js
View File

@ -20,8 +20,7 @@ const messages = defineMessages({
uncollapse: { id: 'status.uncollapse', defaultMessage: 'Uncollapse' }, uncollapse: { id: 'status.uncollapse', defaultMessage: 'Uncollapse' },
}); });
@injectIntl class StatusUnextended extends ImmutablePureComponent {
export default class Status extends ImmutablePureComponent {
static contextTypes = { static contextTypes = {
router: PropTypes.object, router: PropTypes.object,
@ -104,7 +103,7 @@ export default class Status extends ImmutablePureComponent {
this.handleIntersection this.handleIntersection
); );
if (node.clientHeight > 400) this.setState({ isCollapsed: true }); if (node.clientHeight > 400 && !(this.props.status.get('reblog', null) !== null && typeof this.props.status.get('reblog') === 'object')) this.setState({ isCollapsed: true });
this.componentMounted = true; this.componentMounted = true;
} }
@ -260,9 +259,12 @@ export default class Status extends ImmutablePureComponent {
{isCollapsed ? null : media} {isCollapsed ? null : media}
{isCollapsed ? null : <StatusActionBar {...this.props} />} {isCollapsed ? null : <StatusActionBar status={status} account={account} {...other} />}
</div> </div>
); );
} }
} }
const Status = injectIntl(StatusUnextended);
export default Status;