treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fixed autocollapse detection

lolsob-rspec
kibi! 2018-01-14 13:29:51 -08:00
parent a9bfc5b3c5
commit 8399fba7f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/components/status.js
View File

@ -121,15 +121,15 @@ export default class Status extends ImmutablePureComponent {
if (function () { if (function () {
switch (true) { switch (true) {
case collapse: case !!collapse:
case autoCollapseSettings.get('all'): case !!autoCollapseSettings.get('all'):
case autoCollapseSettings.get('notifications') && muted: case autoCollapseSettings.get('notifications') && !!muted:
case autoCollapseSettings.get('lengthy') && node.clientHeight > ( case autoCollapseSettings.get('lengthy') && node.clientHeight > (
status.get('media_attachments').size && !muted ? 650 : 400 status.get('media_attachments').size && !muted ? 650 : 400
): ):
case autoCollapseSettings.get('reblogs') && prepend === 'reblogged_by': case autoCollapseSettings.get('reblogs') && prepend === 'reblogged_by':
case autoCollapseSettings.get('replies') && status.get('in_reply_to_id', null) !== null: case autoCollapseSettings.get('replies') && status.get('in_reply_to_id', null) !== null:
case autoCollapseSettings.get('media') && !(status.get('spoiler_text').length) && status.get('media_attachments').size: case autoCollapseSettings.get('media') && !(status.get('spoiler_text').length) && !!status.get('media_attachments').size:
return true; return true;
default: default:
return false; return false;