diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-18 22:05:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-18 22:05:11 +0100 |
commit | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (patch) | |
tree | dfeaba762dfa49844cc5cf6140deb30874734a46 /app/javascript/flavours/glitch/features/ui/components | |
parent | 2be88d1930433f55e5ae17174f3711cefb3d5158 (diff) | |
parent | ea9a1d79df60749eb21fb592c608dcaa4c935c75 (diff) |
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/focal_point_modal.js | 3 |
1 files changed, 1 insertions, 2 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 e36657fab..8e624adb3 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 @@ -5,11 +5,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; import classNames from 'classnames'; import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from 'flavours/glitch/actions/compose'; -import { getPointerPosition } from 'flavours/glitch/features/video'; +import Video, { getPointerPosition } from 'flavours/glitch/features/video'; 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'; |