diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:58:14 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:58:14 +0200 |
commit | 93c13fe691750e8c7f0c90091bca2564b97ccba7 (patch) | |
tree | 17b12a54da0840e0e7f7e0c03f32fccc1a5b9137 /app/assets/javascripts/components/components/status.jsx | |
parent | 16d50f60d1f802ee7760ca24883df2ed5a8f4ac0 (diff) | |
parent | 42d54dc9ea8c6e73008c4400a2d154f0e6bdd384 (diff) |
Merge branch 'patf-pause-gif'
Diffstat (limited to 'app/assets/javascripts/components/components/status.jsx')
-rw-r--r-- | app/assets/javascripts/components/components/status.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx index d2d2aaf20..abc123f26 100644 --- a/app/assets/javascripts/components/components/status.jsx +++ b/app/assets/javascripts/components/components/status.jsx @@ -29,6 +29,7 @@ const Status = React.createClass({ onBlock: React.PropTypes.func, me: React.PropTypes.number, boostModal: React.PropTypes.bool, + autoPlayGif: React.PropTypes.bool, muted: React.PropTypes.bool }, @@ -79,7 +80,7 @@ const Status = React.createClass({ if (status.getIn(['media_attachments', 0, 'type']) === 'video') { media = <VideoPlayer media={status.getIn(['media_attachments', 0])} sensitive={status.get('sensitive')} onOpenVideo={this.props.onOpenVideo} />; } else { - media = <MediaGallery media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} />; + media = <MediaGallery media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} autoPlayGif={this.props.autoPlayGif} />; } } |