diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 09:26:33 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 09:26:33 +0100 |
| commit | 47c3a089c5c3016197964f16f611f72bc4aadde6 (patch) | |
| tree | f0a4d1a660e4ae2a58077ad1c250353781445cff /webclient/components/fileUpload/file-upload-service.js | |
| parent | Removed member list servlet: now using generic state paths. (diff) | |
| parent | Order 'get_recent_events_for_room' correctly. (diff) | |
| download | synapse-47c3a089c5c3016197964f16f611f72bc4aadde6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'webclient/components/fileUpload/file-upload-service.js')
| -rw-r--r-- | webclient/components/fileUpload/file-upload-service.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webclient/components/fileUpload/file-upload-service.js b/webclient/components/fileUpload/file-upload-service.js index 6606f31e22..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); }, @@ -82,6 +82,7 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities']) // First, get the image size mUtilities.getImageSize(imageFile).then( function(size) { + console.log("image size: " + JSON.stringify(size)); // The final operation: send imageFile var uploadImage = function() { |