about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/status
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-28 14:10:26 +0200
committerThibG <thib@sitedethib.com>2018-08-31 18:35:03 +0200
commit9d2739d74da26b725f03eb5a19a93c6041714be7 (patch)
tree35472cc43b654785d54f2f54be652f39cb072e2a /app/javascript/flavours/glitch/features/status
parent130bdb5ee8c0689a44b353be9bc0ca78b75bdf2e (diff)
Add a setting to automatically unfold all content warnings
Diffstat (limited to 'app/javascript/flavours/glitch/features/status')
-rw-r--r--app/javascript/flavours/glitch/features/status/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js
index 1fceaa5ea..060f2f345 100644
--- a/app/javascript/flavours/glitch/features/status/index.js
+++ b/app/javascript/flavours/glitch/features/status/index.js
@@ -82,8 +82,8 @@ export default class Status extends ImmutablePureComponent {
 
   state = {
     fullscreen: false,
-    isExpanded: false,
-    threadExpanded: null,
+    isExpanded: this.props.settings.getIn(['content_warnings', 'auto_unfold']),
+    threadExpanded: undefined,
   };
 
   componentWillMount () {