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

cleanup and formatting

Browse Source
This commit is contained in:
Kyle Spearrin
2017-11-27 23:46:03 -05:00
parent 78c4ea7ecb
commit 8332e52a7b
19 changed files with 104 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/popup/app/settings/folders/edit-folder.component.ts
View File

@@ -11,8 +11,8 @@ class EditFolderController {
folder: Folder;
constructor($scope: any, $stateParams: any, private folderService: any, private toastr: any, private $state: any,
private SweetAlert: any, utilsService: UtilsService, private $analytics: any, private i18nService: any,
$timeout: any) {
private SweetAlert: any, utilsService: UtilsService, private $analytics: any, private i18nService: any,
$timeout: any) {
this.i18n = i18nService;
$timeout(() => {
@@ -25,14 +25,11 @@ class EditFolderController {
$onInit() {
this.folderId = this.$transition$.params('to').folderId;
this.folderService
.get(this.folderId)
.then((folder: any) => {
return folder.decrypt();
}).then((model: Folder) => {
this.folder = model;
});
this.folderService.get(this.folderId).then((folder: any) => {
return folder.decrypt();
}).then((model: Folder) => {
this.folder = model;
});
}
save(model: any) {
@@ -41,17 +38,14 @@ class EditFolderController {
return;
}
this.savePromise = this.folderService
.encrypt(model)
.then((folderModel: any) => {
const folder = new Folder(folderModel, true);
return this.folderService.saveWithServer(folder);
})
.then((folder: any) => {
this.$analytics.eventTrack('Edited Folder');
this.toastr.success(this.i18nService.editedFolder);
this.$state.go('^.list', { animation: 'out-slide-down' });
});
this.savePromise = this.folderService.encrypt(model).then((folderModel: any) => {
const folder = new Folder(folderModel, true);
return this.folderService.saveWithServer(folder);
}).then((folder: any) => {
this.$analytics.eventTrack('Edited Folder');
this.toastr.success(this.i18nService.editedFolder);
this.$state.go('^.list', { animation: 'out-slide-down' });
});
}
delete() {
@@ -63,15 +57,13 @@ class EditFolderController {
cancelButtonText: this.i18nService.no,
}, (confirmed: boolean) => {
if (confirmed) {
this.folderService
.deleteWithServer(this.folderId)
.then(() => {
this.$analytics.eventTrack('Deleted Folder');
this.toastr.success(this.i18nService.deletedFolder);
this.$state.go('^.list', {
animation: 'out-slide-down',
});
this.folderService.deleteWithServer(this.folderId).then(() => {
this.$analytics.eventTrack('Deleted Folder');
this.toastr.success(this.i18nService.deletedFolder);
this.$state.go('^.list', {
animation: 'out-slide-down',
});
});
}
});
}