about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorIsabelle Knott <isabelle@blackle-mori.com>2017-04-19 08:28:00 -0400
committerEugen <eugen@zeonfederated.com>2017-04-19 14:28:00 +0200
commit97012487ed4bbc7cbba214bf63c56260887c589d (patch)
tree2b9ade558243639e71e1ba2e8dff6e3ffa160d41 /app/assets
parent9a7ea7c870280b9997c47f3fcdea82296c23fb68 (diff)
Do not show link preview card if toot has a spoiler (#1617)
* Do not show link preview card if toot has a spoiler

* == to ===
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/components/features/status/components/detailed_status.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/status/components/detailed_status.jsx b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
index bd386b251..9d854f0d3 100644
--- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx
+++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
@@ -45,7 +45,7 @@ const DetailedStatus = React.createClass({
       } else {
         media = <MediaGallery sensitive={status.get('sensitive')} media={status.get('media_attachments')} height={300} onOpenMedia={this.props.onOpenMedia} autoPlayGif={this.props.autoPlayGif} />;
       }
-    } else {
+    } else if (status.get('spoiler_text').length === 0) {
       media = <CardContainer statusId={status.get('id')} />;
     }