diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-18 14:42:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-18 14:42:32 -0400 |
commit | ab67f6e257f6e8f08145a02a7b93550f99641be4 (patch) | |
tree | d33d1c58a3d229f7e37db58bc2c397ac3806c503 /webapp/components/view_image.jsx | |
parent | 0231e95f1c5a8c42ba97875f0d2301815f552974 (diff) | |
download | chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.gz chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.bz2 chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.zip |
PLT-6215 Major post list refactor (#6501)
* Major post list refactor
* Fix post and thread deletion
* Fix preferences not selecting correctly
* Fix military time displaying
* Fix UP key for editing posts
* Fix ESLint error
* Various fixes and updates per feedback
* Fix for permalink view
* Revert to old scrolling method and various fixes
* Add floating timestamp, new message indicator, scroll arrows
* Update post loading for focus mode and add visibility limit
* Fix pinning posts and a react warning
* Add loading UI updates from Asaad
* Fix refreshing loop
* Temporarily bump post visibility limit
* Update infinite scrolling
* Remove infinite scrolling
Diffstat (limited to 'webapp/components/view_image.jsx')
-rw-r--r-- | webapp/components/view_image.jsx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/webapp/components/view_image.jsx b/webapp/components/view_image.jsx index b2cd41810..04ace6c55 100644 --- a/webapp/components/view_image.jsx +++ b/webapp/components/view_image.jsx @@ -9,9 +9,8 @@ import ViewImagePopoverBar from './view_image_popover_bar.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; -import FileStore from 'stores/file_store.jsx'; - import * as Utils from 'utils/utils.jsx'; +import {getFileUrl, getFilePreviewUrl} from 'mattermost-redux/utils/file_utils'; import Constants from 'utils/constants.jsx'; const KeyCodes = Constants.KeyCodes; @@ -127,10 +126,10 @@ export default class ViewImageModal extends React.Component { if (fileType === 'image') { let previewUrl; if (fileInfo.has_image_preview) { - previewUrl = FileStore.getFilePreviewUrl(fileInfo.id); + previewUrl = getFilePreviewUrl(fileInfo.id); } else { // some images (eg animated gifs) just show the file itself and not a preview - previewUrl = FileStore.getFileUrl(fileInfo.id); + previewUrl = getFileUrl(fileInfo.id); } const img = new Image(); @@ -175,7 +174,7 @@ export default class ViewImageModal extends React.Component { } const fileInfo = this.props.fileInfos[this.state.imgId]; - const fileUrl = FileStore.getFileUrl(fileInfo.id); + const fileUrl = getFileUrl(fileInfo.id); let content; if (this.state.loaded[this.state.imgId]) { @@ -346,7 +345,7 @@ LoadingImagePreview.propTypes = { function ImagePreview({fileInfo, fileUrl}) { let previewUrl; if (fileInfo.has_preview_image) { - previewUrl = FileStore.getFilePreviewUrl(fileInfo.id); + previewUrl = getFilePreviewUrl(fileInfo.id); } else { previewUrl = fileUrl; } |