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

Added import processing message.

Browse Source
This commit is contained in:
Kyle Spearrin
2015-12-29 21:47:07 -05:00
parent 0c32e890b3
commit 2bc5d92c78
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Vault/wwwroot/app/tools/toolsImportController.js
View File

@@ -5,6 +5,7 @@
$scope.model = { source: 'local' };
$scope.import = function (model) {
$scope.processing = true;
var file = document.getElementById('file').files[0];
// local
@@ -77,7 +78,7 @@
};
function doImport(folders, sites, siteRelationships) {
$scope.importPromise = apiService.accounts.import({
apiService.accounts.import({
folders: cipherService.encryptFolders(folders, cryptoService.getKey()),
sites: cipherService.encryptSites(sites, cryptoService.getKey()),
siteRelationships: siteRelationships
@@ -88,8 +89,8 @@
});
}, function () {
$uibModalInstance.dismiss('cancel');
toastr.error('Something went wrong.', 'Oh No!');
}).$promise;
toastr.error('Something went wrong. Try again.', 'Oh No!');
});
}
$scope.close = function () {