mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-09 15:02:37 +00:00
Made uploadContent compatible for sending Blob objects
This commit is contained in:
parent
efe5aa6464
commit
9d4bc8985f
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user