diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-06 16:23:37 -0500 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2017-09-06 18:23:37 -0300 |
| commit | b84bd21089d305333fa4114b95be70f5ad94ad1b (patch) | |
| tree | 297452f516ac883345369452f5bc3398a794d134 | |
| parent | 9ed1d956ee0878aac48d7ded10d48848a32e9e91 (diff) | |
| download | chat-b84bd21089d305333fa4114b95be70f5ad94ad1b.tar.gz chat-b84bd21089d305333fa4114b95be70f5ad94ad1b.tar.bz2 chat-b84bd21089d305333fa4114b95be70f5ad94ad1b.zip | |
more robust file upload extension (#7390)
| -rw-r--r-- | webapp/components/file_upload.jsx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index eb966aeed..479dfa145 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -296,8 +296,16 @@ class FileUpload extends React.Component { min = String(d.getMinutes()); } - const ext = file.name.lastIndexOf('.'); - const name = formatMessage(holders.pasted) + d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + hour + '-' + min + (ext >= 0 ? file.name.substr(ext) : ''); + var ext = ''; + if (file.name) { + if (file.name.includes('.')) { + ext = file.name.substr(file.name.lastIndexOf('.')); + } + } else if (items[i].type.includes('/')) { + ext = '.' + items[i].type.split('/')[1].toLowerCase(); + } + + const name = formatMessage(holders.pasted) + d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + hour + '-' + min + ext; const request = uploadFile( file, |