diff options
author | ThibG <thib@sitedethib.com> | 2019-08-30 00:18:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-30 00:18:08 +0200 |
commit | 2848c08953a8555e06791170dbf1090575e05d8a (patch) | |
tree | 53e8e98051c24ac4fb32ce5692e241b6a6391de3 /app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js | |
parent | 79725f659d5e9c449df0ff73f9363407a0a064bd (diff) | |
parent | 969d04385157175dc9c9f46987976d8fc5771707 (diff) |
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js index c4cc18f94..7d1deb4ce 100644 --- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js @@ -10,6 +10,7 @@ import { FormattedMessage, defineMessages, injectIntl } from 'react-intl'; import IconButton from 'flavours/glitch/components/icon_button'; import Button from 'flavours/glitch/components/button'; import Video from 'flavours/glitch/features/video'; +import Audio from 'flavours/glitch/features/audio'; import Textarea from 'react-textarea-autosize'; import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress'; import CharacterCounter from 'flavours/glitch/features/compose/components/character_counter'; @@ -244,12 +245,23 @@ class FocalPointModal extends ImmutablePureComponent { </div> )} - {['audio', 'video'].includes(media.get('type')) && ( + {media.get('type') === 'video' && ( <Video preview={media.get('preview_url')} blurhash={media.get('blurhash')} src={media.get('url')} detailed + inline + editable + /> + )} + + {media.get('type') === 'audio' && ( + <Audio + src={media.get('url')} + duration={media.getIn(['meta', 'original', 'duration'], 0)} + height={150} + preload editable /> )} |