diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-25 11:23:55 -0500 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-25 11:23:55 -0500 |
| commit | ea71731f838fc010cfc7511c09875184d1b2396b (patch) | |
| tree | 7841e6908a42badb5171760426d2ca5898a76bda /web/react/components/file_info_preview.jsx | |
| parent | 6b534f1b0dae2614ec267a82f1c4dc1b096b7b1c (diff) | |
| parent | 5478ea34e436109ece417c3704a1fa36d3aba4a5 (diff) | |
| download | chat-ea71731f838fc010cfc7511c09875184d1b2396b.tar.gz chat-ea71731f838fc010cfc7511c09875184d1b2396b.tar.bz2 chat-ea71731f838fc010cfc7511c09875184d1b2396b.zip | |
merging
Diffstat (limited to 'web/react/components/file_info_preview.jsx')
| -rw-r--r-- | web/react/components/file_info_preview.jsx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/web/react/components/file_info_preview.jsx b/web/react/components/file_info_preview.jsx index 4b76cd162..45d89007f 100644 --- a/web/react/components/file_info_preview.jsx +++ b/web/react/components/file_info_preview.jsx @@ -5,11 +5,16 @@ import * as Utils from '../utils/utils.jsx'; export default function FileInfoPreview({filename, fileUrl, fileInfo}) { // non-image files include a section providing details about the file - let infoString = 'File type ' + fileInfo.extension.toUpperCase(); - if (fileInfo.size > 0) { - infoString += ', Size ' + Utils.fileSizeToString(fileInfo.size); + const infoParts = []; + + if (fileInfo.extension !== '') { + infoParts.push('File type ' + fileInfo.extension.toUpperCase()); } + infoParts.push('Size ' + Utils.fileSizeToString(fileInfo.size)); + + const infoString = infoParts.join(', '); + const name = decodeURIComponent(Utils.getFileName(filename)); return ( |