diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-08 18:06:35 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-08 18:06:35 -0400 |
commit | 3803750fb189880eb4c4b6d41fdca1e6f162b116 (patch) | |
tree | 9ed808fec09a7949b641a5b8effb99d30530ceb5 /webapp | |
parent | df77179eccffbb77f684abde45cac743f5d0b414 (diff) | |
download | chat-3803750fb189880eb4c4b6d41fdca1e6f162b116.tar.gz chat-3803750fb189880eb4c4b6d41fdca1e6f162b116.tar.bz2 chat-3803750fb189880eb4c4b6d41fdca1e6f162b116.zip |
Changed getFile api call to always attach headers
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/file_attachment.jsx | 2 | ||||
-rw-r--r-- | webapp/components/view_image.jsx | 2 | ||||
-rw-r--r-- | webapp/utils/utils.jsx | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/webapp/components/file_attachment.jsx b/webapp/components/file_attachment.jsx index 6253e17e1..ccd4070aa 100644 --- a/webapp/components/file_attachment.jsx +++ b/webapp/components/file_attachment.jsx @@ -130,7 +130,7 @@ class FileAttachment extends React.Component { var filename = this.props.filename; var fileInfo = utils.splitFileLocation(filename); - var fileUrl = utils.getFileUrl(filename, true); + var fileUrl = utils.getFileUrl(filename); var type = utils.getFileType(fileInfo.ext); var thumbnail; diff --git a/webapp/components/view_image.jsx b/webapp/components/view_image.jsx index 7572f88ae..3d3107d92 100644 --- a/webapp/components/view_image.jsx +++ b/webapp/components/view_image.jsx @@ -228,7 +228,7 @@ class ViewImageModal extends React.Component { } const filename = this.props.filenames[this.state.imgId]; - const fileUrl = Utils.getFileUrl(filename, true); + const fileUrl = Utils.getFileUrl(filename); var content; if (this.state.loaded[this.state.imgId]) { diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index a70666e2d..ac373d638 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -1110,9 +1110,8 @@ export function fileSizeToString(bytes) { } // Converts a filename (like those attached to Post objects) to a url that can be used to retrieve attachments from the server. -export function getFileUrl(filename, isDownload) { - const downloadParam = isDownload ? '?download=1' : ''; - return getWindowLocationOrigin() + '/api/v1/files/get' + filename + downloadParam; +export function getFileUrl(filename) { + return getWindowLocationOrigin() + '/api/v1/files/get' + filename; } // Gets the name of a file (including extension) from a given url or file path. |