safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-10 15:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-526: Handle rejections for absolutely all promises.

Browse Source
This commit is contained in:
Michael Jumper
2018-04-26 22:15:17 -07:00
parent f6d5e5662b
commit 266b445c21
23 changed files with 118 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
guacamole/src/main/webapp/app/rest/services/dataSourceService.js
View File

@@ -27,7 +27,8 @@ angular.module('rest').factory('dataSourceService', ['$injector',
var Error = $injector.get('Error');
// Required services
var $q = $injector.get('$q');
var $q = $injector.get('$q');
var requestService = $injector.get('requestService');
// Service containing all caches
var service = {};
@@ -92,7 +93,7 @@ angular.module('rest').factory('dataSourceService', ['$injector',
},
// Fail on any errors (except "NOT FOUND")
function immediateRequestFailed(error) {
requestService.createErrorCallback(function immediateRequestFailed(error) {
if (error.type === Error.Type.NOT_FOUND)
deferredRequest.resolve();
@@ -101,7 +102,7 @@ angular.module('rest').factory('dataSourceService', ['$injector',
else
deferredRequest.reject(error);
});
}));
});
@@ -111,9 +112,9 @@ angular.module('rest').factory('dataSourceService', ['$injector',
},
// Reject if at least one request fails
function requestFailed(response) {
deferred.reject(response);
});
requestService.createErrorCallback(function requestFailed(error) {
deferred.reject(error);
}));
return deferred.promise;