bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 18:53:29 +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

16
src/popup/app/settings/settingsEditFolderController.js
View File

@@ -1,17 +1,17 @@
angular
.module('bit.settings')
.controller('settingsEditFolderController', function ($scope, $stateParams, folderService, toastr, $q, $state, SweetAlert,
.controller('settingsEditFolderController', function ($scope, $stateParams, folderService, toastr, $state, SweetAlert,
utilsService, $analytics, i18nService) {
$scope.i18n = i18nService;
$scope.folder = {};
var folderId = $stateParams.folderId;
$('#name').focus();
folderService.get(folderId, function (folder) {
$q.when(folder.decrypt()).then(function (model) {
$scope.folder = model;
});
folderService.get(folderId).then(function (folder) {
return folder.decrypt();
}).then(function (model) {
$scope.folder = model;
});
utilsService.initListSectionItemListeners($(document), angular);
@@ -23,9 +23,9 @@
return;
}
$scope.savePromise = $q.when(folderService.encrypt(model)).then(function (folderModel) {
$scope.savePromise = folderService.encrypt(model).then(function (folderModel) {
var folder = new Folder(folderModel, true);
return $q.when(folderService.saveWithServer(folder)).then(function (folder) {
return folderService.saveWithServer(folder).then(function (folder) {
$analytics.eventTrack('Edited Folder');
toastr.success(i18nService.editedFolder);
$state.go('folders', { animation: 'out-slide-down' });
@@ -42,7 +42,7 @@
cancelButtonText: i18nService.no
}, function (confirmed) {
if (confirmed) {
$q.when(folderService.deleteWithServer(folderId)).then(function () {
folderService.deleteWithServer(folderId).then(function () {
$analytics.eventTrack('Deleted Folder');
toastr.success(i18nService.deletedFolder);
$state.go('folders', {

3
src/popup/app/settings/settingsFoldersController.js
View File

@@ -7,8 +7,7 @@
load();
function load() {
var foldersPromise = $q.when(folderService.getAllDecrypted());
foldersPromise.then(function (folders) {
folderService.getAllDecrypted().then(function (folders) {
if (folders.length > 0 && folders[0].id === null) {
// remove the "none" folder
$scope.folders = folders.slice(1);

6
src/popup/app/tools/toolsExportController.js
View File

@@ -45,14 +45,12 @@
var decLogins = [];
var promises = [];
var folderPromise = $q.when(folderService.getAllDecrypted());
folderPromise.then(function (folders) {
var folderPromise = folderService.getAllDecrypted().then(function (folders) {
decFolders = folders;
});
promises.push(folderPromise);
var loginPromise = $q.when(cipherService.getAllDecrypted());
loginPromise.then(function (logins) {
var loginPromise = cipherService.getAllDecrypted().then(function (logins) {
decLogins = logins;
});
promises.push(loginPromise);

12
src/popup/app/vault/vaultViewFolderController.js
View File

@@ -29,14 +29,12 @@
var promises = [];
if ($scope.folder.id) {
var folderDeferred = $q.defer();
folderService.get($scope.folder.id, function (folder) {
folder.decrypt().then(function (model) {
decFolder = model;
folderDeferred.resolve();
});
var getPromise = folderService.get($scope.folder.id).then(function (folder) {
return folder.decrypt();
}).then(function (model) {
decFolder = model;
});
promises.push(folderDeferred.promise);
promises.push(getPromise);
}
var cipherPromise = cipherService.getAllDecryptedForFolder($scope.folder.id).then(function (ciphers) {