Fix CW auto-expanding if collapsed toots are disabled

2017-07-12 19:52:36 +02:00 · 2017-07-12 19:52:36 +02:00 · 66b1174d25
parent 183f993b01
commit 66b1174d25
1 changed files with 3 additions and 1 deletions
--- 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