diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-06 17:16:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 17:16:25 -0500 |
| commit | c68b866ef76234dbe65bf012509b7f3cde2bb24c (patch) | |
| tree | 3ca5b6e7fb427c1f48a515ed7f01c1aa454e8c5a | |
| parent | d38328976e2c8bb0fab91e656042a0d8ac37bc76 (diff) | |
| download | chat-c68b866ef76234dbe65bf012509b7f3cde2bb24c.tar.gz chat-c68b866ef76234dbe65bf012509b7f3cde2bb24c.tar.bz2 chat-c68b866ef76234dbe65bf012509b7f3cde2bb24c.zip | |
more robust file upload extension (#7389)
| -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, |