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

load vault data on view/modal events

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-05 23:30:45 -04:00
parent 1520f5e0df
commit aa6fcacd70
1 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/popup/app/vault/vaultController.js
View File

@@ -6,54 +6,63 @@
$scope.sites = []; $scope.sites = [];
$scope.folders = []; $scope.folders = [];
var decSites = []; $scope.$on("$ionicView.enter", function (event, data) {
var decFolders = [{ loadVault();
id: null, });
name: '(none)'
}];
folderService.getAll(function (folders) { function loadVault() {
siteService.getAll(function (sites) { $scope.sites = [];
var promises = []; $scope.folders = [];
for (var i = 0; i < folders.length; i++) { var decSites = [];
decFolders.push({ var decFolders = [{
id: folders[i].id id: null,
name: '(none)'
}];
folderService.getAll(function (folders) {
siteService.getAll(function (sites) {
var promises = [];
for (var i = 0; i < folders.length; i++) {
decFolders.push({
id: folders[i].id
});
var folderNamePromise = decrypt(sites[i].name, i);
promises.push(folderNamePromise);
folderNamePromise.then(function (obj) {
decFolders[obj.index].name = obj.val;
});
}
for (var j = 0; j < sites.length; j++) {
decSites.push({
id: sites[j].id,
folderId: sites[j].folderId,
favorite: sites[j].favorite
});
var namePromise = decrypt(sites[j].name, j);
promises.push(namePromise);
namePromise.then(function (obj) {
decSites[obj.index].name = obj.val;
});
var usernamePromise = decrypt(sites[j].username, j);
promises.push(usernamePromise);
usernamePromise.then(function (obj) {
decSites[obj.index].username = obj.val;
});
}
$q.all(promises).then(function () {
$scope.sites = decSites;
$scope.folders = decFolders;
}); });
var folderNamePromise = decrypt(sites[i].name, i);
promises.push(folderNamePromise);
folderNamePromise.then(function (obj) {
decFolders[obj.index].name = obj.val;
});
}
for (var j = 0; j < sites.length; j++) {
decSites.push({
id: sites[j].id,
folderId: sites[j].folderId,
favorite: sites[j].favorite
});
var namePromise = decrypt(sites[j].name, j);
promises.push(namePromise);
namePromise.then(function (obj) {
decSites[obj.index].name = obj.val;
});
var usernamePromise = decrypt(sites[j].username, j);
promises.push(usernamePromise);
usernamePromise.then(function (obj) {
decSites[obj.index].username = obj.val;
});
}
$q.all(promises).then(function () {
$scope.sites = decSites;
$scope.folders = decFolders;
}); });
}); });
}); }
function decrypt(cipherString, index) { function decrypt(cipherString, index) {
return $q(function (resolve, reject) { return $q(function (resolve, reject) {
@@ -88,21 +97,8 @@
$scope.addSiteModal.hide(); $scope.addSiteModal.hide();
}; };
// Cleanup the modal when we're done with it!
$scope.$on('$destroy', function () {
console.log('modal destroyed');
$scope.addSiteModal.remove();
});
// Execute action on hide modal
$scope.$on('modal.hidden', function () { $scope.$on('modal.hidden', function () {
console.log('modal hidden'); console.log('modal hidden');
// Execute action loadVault();
});
// Execute action on remove modal
$scope.$on('modal.removed', function () {
console.log('modal removed');
// Execute action
}); });
}); });