diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-14 16:17:22 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-14 16:17:22 -0400 |
| commit | c447db6e78df1307d2d1245acdd791de6d79716a (patch) | |
| tree | 1fa74cffe5dbf286f1959beb20b7aeb65bbf27bc | |
| parent | 312f7d76563856ea877bc930100501aef803d078 (diff) | |
| parent | 0654b0c06b516172a5d83759e2b781c9f37f854f (diff) | |
| download | chat-c447db6e78df1307d2d1245acdd791de6d79716a.tar.gz chat-c447db6e78df1307d2d1245acdd791de6d79716a.tar.bz2 chat-c447db6e78df1307d2d1245acdd791de6d79716a.zip | |
Merge pull request #679 from mattermost/fix-file-content-type
Blank Content-Type for file GETs.
| -rw-r--r-- | api/file.go | 1 | ||||
| -rw-r--r-- | web/react/components/file_upload.jsx | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/file.go b/api/file.go index 1d8244fac..692558acf 100644 --- a/api/file.go +++ b/api/file.go @@ -349,6 +349,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "max-age=2592000, public") w.Header().Set("Content-Length", strconv.Itoa(len(f))) + w.Header().Set("Content-Type", "") // need to provide proper Content-Type in the future w.Write(f) } diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx index 534f0136e..bd8945878 100644 --- a/web/react/components/file_upload.jsx +++ b/web/react/components/file_upload.jsx @@ -20,12 +20,11 @@ export default class FileUpload extends React.Component { } fileUploadSuccess(channelId, data) { - var parsedData = $.parseJSON(data); - this.props.onFileUpload(parsedData.filenames, parsedData.client_ids, channelId); + this.props.onFileUpload(data.filenames, data.client_ids, channelId); var requests = this.state.requests; - for (var j = 0; j < parsedData.client_ids.length; j++) { - delete requests[parsedData.client_ids[j]]; + for (var j = 0; j < data.client_ids.length; j++) { + delete requests[data.client_ids[j]]; } this.setState({requests: requests}); } |