diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2018-04-26 11:34:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-26 11:34:14 -0400 |
commit | f4ed38272be7cce814e3d3e7e5a2d1f352279e19 (patch) | |
tree | 4e26499478b18d2338be90f21428f1bd76481b89 /app/javascript/flavours/glitch/features/status/components | |
parent | 8f12afb5996c58ddf41ceaa20f6c4e036273d3a6 (diff) | |
parent | b383c0688a0939d25b9184e61dac72cda71f6926 (diff) |
Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread
Port the “unfold thread” feature from Mastodon's UI to glitch-soc flavour
Diffstat (limited to 'app/javascript/flavours/glitch/features/status/components')
-rw-r--r-- | app/javascript/flavours/glitch/features/status/components/detailed_status.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.js b/app/javascript/flavours/glitch/features/status/components/detailed_status.js index 066499da8..16f7ae830 100644 --- a/app/javascript/flavours/glitch/features/status/components/detailed_status.js +++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.js @@ -24,6 +24,8 @@ export default class DetailedStatus extends ImmutablePureComponent { settings: ImmutablePropTypes.map.isRequired, onOpenMedia: PropTypes.func.isRequired, onOpenVideo: PropTypes.func.isRequired, + onToggleHidden: PropTypes.func.isRequired, + expanded: PropTypes.bool, }; handleAccountClick = (e) => { @@ -41,7 +43,7 @@ export default class DetailedStatus extends ImmutablePureComponent { render () { const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status; - const { expanded, setExpansion, settings } = this.props; + const { expanded, onToggleHidden, settings } = this.props; let media = ''; let mediaIcon = null; @@ -114,7 +116,8 @@ export default class DetailedStatus extends ImmutablePureComponent { media={media} mediaIcon={mediaIcon} expanded={expanded} - setExpansion={setExpansion} + collapsed={false} + onExpandedToggle={onToggleHidden} /> <div className='detailed-status__meta'> |