diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-05 21:02:37 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-05 21:02:37 -0600 |
commit | a617060dfc4f473534f70af2c6a7b07b989492fa (patch) | |
tree | 4e8b6f7b2959bd627852367b21d28bbcc4a80d6e /app/javascript/glitch/components/status | |
parent | 73bf0ea7d1675b46eb778c2d8a6129e1f7a0650e (diff) | |
parent | e0298d66f8f807efe80cb01097b46e0ef33bd154 (diff) |
Merge pull request #206 from glitch-soc/autocollapse-boost
Autocollapse boosts option
Diffstat (limited to 'app/javascript/glitch/components/status')
-rw-r--r-- | app/javascript/glitch/components/status/index.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/glitch/components/status/index.js b/app/javascript/glitch/components/status/index.js index 9e758793c..6bd95b051 100644 --- a/app/javascript/glitch/components/status/index.js +++ b/app/javascript/glitch/components/status/index.js @@ -287,6 +287,7 @@ properly and our intersection observer is good to go. muted, id, intersectionObserverWrapper, + prepend, } = this.props; const autoCollapseSettings = settings.getIn(['collapsed', 'auto']); @@ -300,6 +301,9 @@ properly and our intersection observer is good to go. status.get('media_attachments').size && !muted ? 650 : 400 ) ) || ( + autoCollapseSettings.get('reblogs') && + prepend === 'reblogged_by' + ) || ( autoCollapseSettings.get('replies') && status.get('in_reply_to_id', null) !== null ) || ( |