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/file_attachment.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/file_attachment.jsx')
-rw-r--r-- | webapp/components/file_attachment.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/file_attachment.jsx b/webapp/components/file_attachment.jsx index 0b8bd1042..f14718e64 100644 --- a/webapp/components/file_attachment.jsx +++ b/webapp/components/file_attachment.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import Constants from 'utils/constants.jsx'; -import FileStore from 'stores/file_store.jsx'; +import {getFileUrl, getFileThumbnailUrl} from 'mattermost-redux/utils/file_utils'; import * as Utils from 'utils/utils.jsx'; import {Tooltip, OverlayTrigger} from 'react-bootstrap'; @@ -46,7 +46,7 @@ export default class FileAttachment extends React.Component { const fileType = Utils.getFileType(fileInfo.extension); if (fileType === 'image') { - const thumbnailUrl = FileStore.getFileThumbnailUrl(fileInfo.id); + const thumbnailUrl = getFileThumbnailUrl(fileInfo.id); const img = new Image(); img.onload = () => { @@ -64,7 +64,7 @@ export default class FileAttachment extends React.Component { render() { const fileInfo = this.props.fileInfo; const fileName = fileInfo.name; - const fileUrl = FileStore.getFileUrl(fileInfo.id); + const fileUrl = getFileUrl(fileInfo.id); let thumbnail; if (this.state.loaded) { @@ -83,7 +83,7 @@ export default class FileAttachment extends React.Component { <div className={className} style={{ - backgroundImage: `url(${FileStore.getFileThumbnailUrl(fileInfo.id)})` + backgroundImage: `url(${getFileThumbnailUrl(fileInfo.id)})` }} /> ); |