about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/components/status.js
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-30 14:46:48 +0100
committerThibG <thib@sitedethib.com>2018-10-30 17:51:06 +0100
commit7e18e95716052d5566f2e31559cbe4a68268f493 (patch)
treebcb6fa8dd5ee80d50f3d7339f86d75b126910a4f /app/javascript/flavours/glitch/components/status.js
parentbdc23388334f9d683d3829c5880cc6064cc994d0 (diff)
Add a local setting for inline preview cards
Diffstat (limited to 'app/javascript/flavours/glitch/components/status.js')
-rw-r--r--app/javascript/flavours/glitch/components/status.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index 0c82ea7c6..9ff53485e 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -478,7 +478,7 @@ export default class Status extends ImmutablePureComponent {
       if (!status.get('sensitive') && !(status.get('spoiler_text').length > 0) && settings.getIn(['collapsed', 'backgrounds', 'preview_images'])) {
         background = attachments.getIn([0, 'preview_url']);
       }
-    } else if (status.get('card')) {
+    } else if (status.get('card') && settings.get('inline_preview_cards')) {
       media = (
         <Card
           onOpenMedia={this.props.onOpenMedia}