summary refs log tree commit diff
path: root/webclient/components/fileUpload/file-upload-service.js
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-20 16:18:50 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-20 17:04:50 +0200
commit6d3391f2f0bbbc99d3a6201bdb134b04e0b10f18 (patch)
tree326ae70bd8fdeadb5bdae89e21c6db402be8f6b2 /webclient/components/fileUpload/file-upload-service.js
parentSanitize message text content only if the type of current message in the ng-r... (diff)
downloadsynapse-6d3391f2f0bbbc99d3a6201bdb134b04e0b10f18.tar.xz
Send images with their imageInfo (size, mymetype, width & height)
Diffstat (limited to 'webclient/components/fileUpload/file-upload-service.js')
-rw-r--r--webclient/components/fileUpload/file-upload-service.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/components/fileUpload/file-upload-service.js b/webclient/components/fileUpload/file-upload-service.js

index d620e6a4d0..65c24f309c 100644 --- a/webclient/components/fileUpload/file-upload-service.js +++ b/webclient/components/fileUpload/file-upload-service.js
@@ -27,10 +27,10 @@ angular.module('mFileUpload', []) * Upload an HTML5 file to a server and returned a promise * that will provide the URL of the uploaded file. */ - this.uploadFile = function(file) { + this.uploadFile = function(file, body) { var deferred = $q.defer(); console.log("Uploading " + file.name + "... to /matrix/content"); - matrixService.uploadContent(file).then( + matrixService.uploadContent(file, body).then( function(response) { var content_url = location.origin + "/matrix/content/" + response.data.content_token; console.log(" -> Successfully uploaded! Available at " + content_url);