GUACAMOLE-526: Update webapp to angular 1.6.9.
This commit is contained in:
1 parent
03281667b4
commit
b3eeb36b87
36 files changed
+301
-159
No files matched your search
@@ -23,6 +23,9 @@
|
||||
angular.module('rest').factory('dataSourceService', ['$injector',
|
||||
function dataSourceService($injector) {
|
||||
|
||||
// Required types
|
||||
var Error = $injector.get('Error');
|
||||
|
||||
// Required services
|
||||
var $q = $injector.get('$q');
|
||||
|
||||
@@ -83,21 +86,20 @@ angular.module('rest').factory('dataSourceService', ['$injector',
|
||||
fn.apply(this, [dataSource].concat(args))
|
||||
|
||||
// Store result on success
|
||||
.then(function immediateRequestSucceeded(response) {
|
||||
results[dataSource] = response.data;
|
||||
.then(function immediateRequestSucceeded(data) {
|
||||
results[dataSource] = data;
|
||||
deferredRequest.resolve();
|
||||
},
|
||||
|
||||
// Fail on any errors (except "NOT FOUND")
|
||||
function immediateRequestFailed(response) {
|
||||
function immediateRequestFailed(error) {
|
||||
|
||||
// Ignore "NOT FOUND" errors
|
||||
if (response.status === 404)
|
||||
if (error.type === Error.Type.NOT_FOUND)
|
||||
deferredRequest.resolve();
|
||||
|
||||
// Explicitly abort for all other errors
|
||||
else
|
||||
deferredRequest.reject(response);
|
||||
deferredRequest.reject(error);
|
||||
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user