about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/status/components/detailed_status.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-03-11 09:52:59 +0100
committerGitHub <noreply@github.com>2018-03-11 09:52:59 +0100
commitb6003afcdb1b89eb967a2b211e3b4e26aed9ac9d (patch)
tree68723a2a3423bfaaeeb801f17e86a10be6680c73 /app/javascript/mastodon/features/status/components/detailed_status.js
parentf5ee2d469bb2ff398571694a95a16c8e819153c9 (diff)
Add show more/less toggle for entire threads in web UI (#6733)
Fix #1258
Diffstat (limited to 'app/javascript/mastodon/features/status/components/detailed_status.js')
-rw-r--r--app/javascript/mastodon/features/status/components/detailed_status.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index d4f21fc32..b5f516032 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -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}