diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-22 10:25:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-22 10:25:32 +0100 |
| commit | acf51276042cf438cbb02bb5ef31c42206d7685d (patch) | |
| tree | c88e41e229638f3b96817af8c46e79d313a01acd /webclient/components | |
| parent | resizeImage: generate an image in the format of the original image. (Tested w... (diff) | |
| download | synapse-acf51276042cf438cbb02bb5ef31c42206d7685d.tar.xz | |
Make the content repo work with in daemon mode. Return the full url on upload. Update the webclient to use new content repo api.
Diffstat (limited to 'webclient/components')
| -rw-r--r-- | webclient/components/fileUpload/file-upload-service.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/components/fileUpload/file-upload-service.js b/webclient/components/fileUpload/file-upload-service.js index 398124fcc4..5f01478fd1 100644 --- a/webclient/components/fileUpload/file-upload-service.js +++ b/webclient/components/fileUpload/file-upload-service.js @@ -33,7 +33,7 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities']) console.log("Uploading " + file.name + "... to /matrix/content"); matrixService.uploadContent(file).then( function(response) { - var content_url = location.origin + "/matrix/content/" + response.data.content_token; + var content_url = response.data.content_token; console.log(" -> Successfully uploaded! Available at " + content_url); deferred.resolve(content_url); }, |