summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-07-27 12:36:14 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-07-28 10:07:11 -0400
commit1842868410ff13b46053f363eb22595faf9d2e7c (patch)
treeb1f7e2eba41525394ca6d8d1c641a23588f5609c /web/react
parentd8e9b7c8e4d9450995855a22005a82541f67a500 (diff)
downloadchat-1842868410ff13b46053f363eb22595faf9d2e7c.tar.gz
chat-1842868410ff13b46053f363eb22595faf9d2e7c.tar.bz2
chat-1842868410ff13b46053f363eb22595faf9d2e7c.zip
Display thumbnails for files without file extensions
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/post_body.jsx2
-rw-r--r--web/react/utils/utils.jsx9
2 files changed, 7 insertions, 4 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 7871f52b7..9f598ecb3 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -126,7 +126,7 @@ module.exports = React.createClass({
} else if (i < Constants.MAX_DISPLAY_FILES) {
postFiles.push(
<div className="post-image__column custom-file" key={fileInfo.name+i}>
- <a href={fileInfo.path+"."+fileInfo.ext} download={fileInfo.name+"."+fileInfo.ext}>
+ <a href={fileInfo.path + (fileInfo.ext ? "." + fileInfo.ext : "")} download={fileInfo.name + (fileInfo.ext ? "." + fileInfo.ext : "")}>
<div className={"file-icon "+utils.getIconClassName(type)}/>
</a>
</div>
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 00580af6e..fbf1e0d4f 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -546,10 +546,13 @@ module.exports.getIconClassName = function(fileType) {
module.exports.splitFileLocation = function(fileLocation) {
var fileSplit = fileLocation.split('.');
- if (fileSplit.length < 2) return {};
- var ext = fileSplit[fileSplit.length-1];
- fileSplit.splice(fileSplit.length-1,1)
+ var ext = "";
+ if (fileSplit.length > 1) {
+ ext = fileSplit[fileSplit.length - 1];
+ fileSplit.splice(fileSplit.length - 1, 1);
+ }
+
var filePath = fileSplit.join('.');
var filename = filePath.split('/')[filePath.split('/').length-1];