LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve error handling in JavaScript promises

pull/91/head
Francis Lachapelle 2015-01-08 16:11:07 -05:00
parent 1a1d51f427
commit 34d7a3bf52
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/WebServerResources/js/Common/resource.js
View File

@ -76,7 +76,10 @@
params: params
})
.success(deferred.resolve)
.error(deferred.reject);
.error(function(data, status) {
if (status == 404)
return deferred.reject();
});
return deferred.promise;
};

17
UI/WebServerResources/js/Contacts/addressbook-model.js
View File

@ -32,11 +32,12 @@
* @desc The factory we'll use to register with Angular
* @returns the AddressBook constructor
*/
AddressBook.$factory = ['$q', '$timeout', 'sgSettings', 'sgResource', 'sgCard', 'sgAcl', function($q, $timeout, Settings, Resource, Card, Acl) {
AddressBook.$factory = ['$q', '$timeout', '$log', 'sgSettings', 'sgResource', 'sgCard', 'sgAcl', function($q, $timeout, $log, Settings, Resource, Card, Acl) {
angular.extend(AddressBook, {
$q: $q,
$timeout: $timeout,
$$resource: new Resource(Settings.activeUser.folderURL + '/Contacts', Settings.activeUser),
$log: $log,
$$resource: new Resource(Settings.activeUser.folderURL + 'Contacts', Settings.activeUser),
$Card: Card,
$$Acl: Acl,
activeUser: Settings.activeUser
@ -204,7 +205,7 @@
/**
* @function $rename
* @memberof AddressBook.prototype
* @desc Rename the addressbook
* @desc Rename the addressbook and keep the list sorted
* @param {string} name - the new name
* @returns a promise of the HTTP operation
*/
@ -296,10 +297,12 @@
_this.$acl = new AddressBook.$$Acl('Contacts/' + _this.id);
});
}, function(data) {
AddressBook.$timeout(function() {
angular.extend(_this, data);
_this.isError = true;
});
_this.isError = true;
if (angular.isObject(data)) {
AddressBook.$timeout(function() {
angular.extend(_this, data);
});
}
});
};