mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Fix CW auto-expanding if collapsed toots are disabled

This commit is contained in:
Ondřej Hruška 2017-07-12 19:52:36 +02:00
parent 183f993b01
commit 66b1174d25
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/glitch/components/status/index.js
View File

@ -233,7 +233,9 @@ uncollapse our status accordingly.
componentWillReceiveProps (nextProps) { componentWillReceiveProps (nextProps) {
if (!nextProps.settings.getIn(['collapsed', 'enabled'])) { if (!nextProps.settings.getIn(['collapsed', 'enabled'])) {
this.setExpansion(true); if (this.state.isExpanded === false) {
this.setExpansion(null);
}
} else if ( } else if (
nextProps.collapse !== this.props.collapse && nextProps.collapse !== this.props.collapse &&
nextProps.collapse !== undefined nextProps.collapse !== undefined