tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Made uploadContent compatible for sending Blob objects

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-08-21 13:36:14 +02:00
parent efe5aa6464
commit 9d4bc8985f
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
webclient/components/matrix/matrix-service.js
View file

@ -61,14 +61,22 @@ angular.module('matrixService', [])
return doBaseRequest(config.homeserver, method, path, params, data, undefined); return doBaseRequest(config.homeserver, method, path, params, data, undefined);
}; };
var doBaseRequest = function(baseUrl, method, path, params, data, headers) { var doBaseRequest = function(baseUrl, method, path, params, data, headers, $httpParams) {
return $http({
var request = {
method: method, method: method,
url: baseUrl + path, url: baseUrl + path,
params: params, params: params,
data: data, data: data,
headers: headers headers: headers
}); };
// Add additional $http parameters
if ($httpParams) {
angular.extend(request, $httpParams);
}
return $http(request);
}; };
@ -326,7 +334,17 @@ angular.module('matrixService', [])
var params = { var params = {
access_token: config.access_token access_token: config.access_token
}; };
return doBaseRequest(config.homeserver, "POST", path, params, file, headers);
// If the file is actually a Blob object, prevent $http from JSON-stringified it before sending
// (Equivalent to jQuery ajax processData = false)
var $httpParams;
if (file instanceof Blob) {
$httpParams = {
transformRequest: angular.identity
};
}
return doBaseRequest(config.homeserver, "POST", path, params, file, headers, $httpParams);
}, },
// start listening on /events // start listening on /events