diff options
author | nicolas <nclm@users.noreply.github.com> | 2016-11-24 20:13:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-24 20:13:30 +0100 |
commit | 60577f4c6ee9f4a4c9af0a41a8954e19a5f2c8cf (patch) | |
tree | 8c661ea7ceaff780965631c530ca065805c1861d /app/assets/javascripts/components/features/status | |
parent | 5e33445c5ff9ded56c2d40eb17d89ace108c3840 (diff) | |
parent | 8e34bed7cce7b97388e55fabacee7d424b5846ea (diff) |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/assets/javascripts/components/features/status')
-rw-r--r-- | app/assets/javascripts/components/features/status/components/detailed_status.jsx | 4 |
1 files changed, 2 insertions, 2 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 76ddafb3b..b967d966f 100644 --- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx +++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx @@ -36,9 +36,9 @@ const DetailedStatus = React.createClass({ if (status.get('media_attachments').size > 0) { if (status.getIn(['media_attachments', 0, 'type']) === 'video') { - media = <VideoPlayer media={status.getIn(['media_attachments', 0])} width={317} height={178} />; + media = <VideoPlayer sensitive={status.get('sensitive')} media={status.getIn(['media_attachments', 0])} width={317} height={178} />; } else { - media = <MediaGallery media={status.get('media_attachments')} height={300} onOpenMedia={this.props.onOpenMedia} />; + media = <MediaGallery sensitive={status.get('sensitive')} media={status.get('media_attachments')} height={300} onOpenMedia={this.props.onOpenMedia} />; } } |