summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-18 17:18:39 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-18 17:18:54 +0100
commit58548ab557bbbdd95644997e00777b0aec8532bc (patch)
treeee70e07d5ef30fd651637a1d41ec856f1cdb28ba /webclient/components
parenths: Make the uploads directory if it doesn't exist. Namespace uploads by the ... (diff)
downloadsynapse-58548ab557bbbdd95644997e00777b0aec8532bc.tar.xz
Implemented GETs for the ContentRepoResource. It all actually appears to be working.
Diffstat (limited to 'webclient/components')
-rw-r--r--webclient/components/fileUpload/file-upload-service.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/webclient/components/fileUpload/file-upload-service.js b/webclient/components/fileUpload/file-upload-service.js
index 0826666fe4..d620e6a4d0 100644
--- a/webclient/components/fileUpload/file-upload-service.js
+++ b/webclient/components/fileUpload/file-upload-service.js
@@ -32,8 +32,9 @@ angular.module('mFileUpload', [])
         console.log("Uploading " + file.name + "... to /matrix/content");
         matrixService.uploadContent(file).then(
             function(response) {
-                console.log("   -> Successfully uploaded! Available at " + location.origin + response.data.url);
-                deferred.resolve(location.origin + response.data.url);
+                var content_url = location.origin + "/matrix/content/" + response.data.content_token;
+                console.log("   -> Successfully uploaded! Available at " + content_url);
+                deferred.resolve(content_url);
             },
             function(error) {
                 console.log("   -> Failed to upload "  + file.name);