bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-22 03:03:43 +00:00
Code Issues Releases Wiki Activity

refactor out callbacks from folderService

Browse Source
This commit is contained in:
Kyle Spearrin
2017-10-17 00:03:27 -04:00
parent ea1ef54c95
commit ba4e2eae15
7 changed files with 151 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/services/apiService.js
View File

@@ -191,8 +191,10 @@ function initApiService() {
// Folder APIs
ApiService.prototype.postFolder = function (folderRequest, success, error) {
var self = this;
ApiService.prototype.postFolder = function (folderRequest) {
var self = this,
deferred = Q.defer();
handleTokenState(self).then(function (tokenHeader) {
$.ajax({
type: 'POST',
@@ -202,19 +204,21 @@ function initApiService() {
dataType: 'json',
headers: tokenHeader,
success: function (response) {
success(new FolderResponse(response));
deferred.resolve(new FolderResponse(response));
},
error: function (jqXHR, textStatus, errorThrown) {
handleError(error, jqXHR, false, self);
handleError(deferred.reject, jqXHR, false, self);
}
});
}, function (jqXHR) {
handleError(error, jqXHR, true, self);
handleError(deferred.reject, jqXHR, true, self);
});
};
ApiService.prototype.putFolder = function (id, folderRequest, success, error) {
var self = this;
ApiService.prototype.putFolder = function (id, folderRequest) {
var self = this,
deferred = Q.defer();
handleTokenState(self).then(function (tokenHeader) {
$.ajax({
type: 'PUT',
@@ -224,19 +228,21 @@ function initApiService() {
dataType: 'json',
headers: tokenHeader,
success: function (response) {
success(new FolderResponse(response));
deferred.resolve(new FolderResponse(response));
},
error: function (jqXHR, textStatus, errorThrown) {
handleError(error, jqXHR, false, self);
handleError(deferred.reject, jqXHR, false, self);
}
});
}, function (jqXHR) {
handleError(error, jqXHR, true, self);
handleError(deferred.reject, jqXHR, true, self);
});
};
ApiService.prototype.deleteFolder = function (id, success, error) {
var self = this;
ApiService.prototype.deleteFolder = function (id) {
var self = this,
deferred = Q.defer();
handleTokenState(self).then(function (tokenHeader) {
$.ajax({
type: 'DELETE',
@@ -244,14 +250,14 @@ function initApiService() {
dataType: 'text',
headers: tokenHeader,
success: function (response) {
success();
deferred.resolve();
},
error: function (jqXHR, textStatus, errorThrown) {
handleError(error, jqXHR, false, self);
handleError(deferred.reject, jqXHR, false, self);
}
});
}, function (jqXHR) {
handleError(error, jqXHR, true, self);
handleError(deferred.reject, jqXHR, true, self);
});
};