diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-12 19:52:36 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-12 19:52:36 +0200 |
| commit | 66b1174d258e4ee0b4a410f2aa3b63f1e6cf280e (patch) | |
| tree | ae5caf6eac1283110dd51232412213bb0e36c243 /app/javascript/glitch | |
| parent | 183f993b018dfa2f4d4886f5c211e6a9968f4eb6 (diff) | |
Fix CW auto-expanding if collapsed toots are disabled
Diffstat (limited to 'app/javascript/glitch')
| -rw-r--r-- | app/javascript/glitch/components/status/index.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/glitch/components/status/index.js b/app/javascript/glitch/components/status/index.js index a11cc0b6e..12ea0e9aa 100644 --- a/app/javascript/glitch/components/status/index.js +++ b/app/javascript/glitch/components/status/index.js @@ -233,7 +233,9 @@ uncollapse our status accordingly. componentWillReceiveProps (nextProps) { if (!nextProps.settings.getIn(['collapsed', 'enabled'])) { - this.setExpansion(true); + if (this.state.isExpanded === false) { + this.setExpansion(null); + } } else if ( nextProps.collapse !== this.props.collapse && nextProps.collapse !== undefined |