diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-04 14:05:33 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-08-04 11:05:33 -0700 |
commit | fb2022fb1cb3c8023efd22316d570d9b26facbd1 (patch) | |
tree | d70450ccfc3bfed2d10c6bfcb943ddda164d9882 /webapp/components/view_image.jsx | |
parent | 399865923658319d6d12a7719bc3b5554218bbad (diff) | |
download | chat-fb2022fb1cb3c8023efd22316d570d9b26facbd1.tar.gz chat-fb2022fb1cb3c8023efd22316d570d9b26facbd1.tar.bz2 chat-fb2022fb1cb3c8023efd22316d570d9b26facbd1.zip |
PLT-6924 Added ability to disable file uploads/downloads on old mobile apps (#7117)
Diffstat (limited to 'webapp/components/view_image.jsx')
-rw-r--r-- | webapp/components/view_image.jsx | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/webapp/components/view_image.jsx b/webapp/components/view_image.jsx index 237d0a6dc..4350711fc 100644 --- a/webapp/components/view_image.jsx +++ b/webapp/components/view_image.jsx @@ -1,24 +1,25 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import AudioVideoPreview from './audio_video_preview.jsx'; -import CodePreview from './code_preview.jsx'; -import PDFPreview from './pdf_preview.jsx'; -import FileInfoPreview from './file_info_preview.jsx'; -import ViewImagePopoverBar from './view_image_popover_bar.jsx'; +import $ from 'jquery'; +import PropTypes from 'prop-types'; +import React from 'react'; +import {Modal} from 'react-bootstrap'; import * as GlobalActions from 'actions/global_actions.jsx'; +import * as FileUtils from 'utils/file_utils'; 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; +import {KeyCodes} from 'utils/constants.jsx'; -import $ from 'jquery'; -import PropTypes from 'prop-types'; -import React from 'react'; -import {Modal} from 'react-bootstrap'; +import {getFileUrl, getFilePreviewUrl} from 'mattermost-redux/utils/file_utils'; + +import AudioVideoPreview from './audio_video_preview.jsx'; +import CodePreview from './code_preview.jsx'; +import FileInfoPreview from './file_info_preview.jsx'; +import PDFPreview from './pdf_preview.jsx'; +import ViewImagePopoverBar from './view_image_popover_bar.jsx'; import loadingGif from 'images/load.gif'; @@ -350,6 +351,10 @@ function ImagePreview({fileInfo, fileUrl}) { previewUrl = fileUrl; } + if (!FileUtils.canDownloadFiles()) { + return <img src={previewUrl}/>; + } + return ( <a href={fileUrl} |