Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix “read more” button behing hidden (regression from #11404) #11522

Merged
merged 2 commits into from
Aug 8, 2019
Merged

Fix “read more” button behing hidden (regression from #11404) #11522

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c590a5
Fix “read more” button behing hidden (regression from #11404)
ClearlyClaire Aug 8, 2019
0058055
Remove dead code
ClearlyClaire Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions app/javascript/mastodon/components/status_content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@ export default class StatusContent extends React.PureComponent {
}
}

handleCollapsedClick = (e) => {
e.preventDefault();
this.setState({ collapsed: !this.state.collapsed });
}

setRef = (c) => {
this.node = c;
}
Expand Down Expand Up @@ -234,15 +229,19 @@ export default class StatusContent extends React.PureComponent {
</div>
);
} else if (this.props.onClick) {
return (
const output = [
<div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
<div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} lang={status.get('language')} />

{!!this.state.collapsed && readMoreButton}

{!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
</div>
);
</div>,
];

if (this.state.collapsed) {
output.push(readMoreButton);
}

return output;
} else {
return (
<div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle}>
Expand Down