diff options
author | ThibG <thib@sitedethib.com> | 2020-04-25 17:50:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-25 17:50:22 +0200 |
commit | 9c61dadc0db7009853c6b2345a02c3b219022929 (patch) | |
tree | 1a79819019d47e81085941b7698e480bad79ed67 /app/javascript/flavours/glitch/components/status.js | |
parent | 60f8a63a76f7c866b5338c33a8b897ba022368ca (diff) | |
parent | 9d41a410a38549f9d07e550b8cda7460b423cb6b (diff) |
Merge pull request #1321 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components/status.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/status.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index 23cdc0167..91bc06b3c 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -372,8 +372,8 @@ class Status extends ImmutablePureComponent { } }; - handleOpenVideo = (media, startTime) => { - this.props.onOpenVideo(media, startTime); + handleOpenVideo = (media, options) => { + this.props.onOpenVideo(media, options); } handleHotkeyOpenMedia = e => { @@ -385,7 +385,7 @@ class Status extends ImmutablePureComponent { if (status.getIn(['media_attachments', 0, 'type']) === 'audio') { // TODO: toggle play/paused? } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') { - onOpenVideo(status.getIn(['media_attachments', 0]), 0); + onOpenVideo(status.getIn(['media_attachments', 0]), { startTime: 0 }); } else { onOpenMedia(status.get('media_attachments'), 0); } |