yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Returning request response from downloadFile promise

Browse Source
This commit is contained in:
Callum Whyte
2020-10-25 20:16:01 +00:00
committed by Laura Weatherhead
parent f88144ae48
commit 620c11c38c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
View File

@@ -18,7 +18,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
*
* @param {string} a virtual path, if this is already an absolute path it will just be returned, if this is a relative path an exception will be thrown
*/
convertVirtualToAbsolutePath: function(virtualPath) {
convertVirtualToAbsolutePath: function (virtualPath) {
if (virtualPath.startsWith("/")) {
return virtualPath;
}
@@ -136,7 +136,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
};
// if "opts" is a promise, we set "err.errorMsg" to be that promise
if (typeof(opts) == "object" && typeof(opts.then) == "function") {
if (typeof (opts) == "object" && typeof (opts.then) == "function") {
err.errorMsg = opts;
}
@@ -339,7 +339,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
// and setting the Content-type manually will not set this boundary parameter. For whatever reason, setting the Content-type to 'undefined'
// will force the request to automatically populate the headers properly including the boundary parameter.
headers: { 'Content-Type': undefined },
transformRequest: function(data) {
transformRequest: function (data) {
var formData = new FormData();
//add the json data
if (Utilities.isArray(data)) {
@@ -359,9 +359,9 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
return formData;
},
data: jsonData
}).then(function(response) {
}).then(function (response) {
return $q.resolve(response);
}, function(response) {
}, function (response) {
return $q.reject(response);
});
},
@@ -377,7 +377,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
* @param {string} httpPath the path (url) to the resource being downloaded
* @returns {Promise} http promise object.
*/
downloadFile : function (httpPath) {
downloadFile: function (httpPath) {
/**
* Based on an implementation here: web.student.tuwien.ac.at/~e0427417/jsdownload.html
@@ -471,7 +471,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
window.open(httpPath, '_blank', '');
}
return $q.resolve();
return $q.resolve(response);
}, function (response) {
@@ -484,4 +484,5 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
}
};
}
angular.module('umbraco.services').factory('umbRequestHelper', umbRequestHelper);