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

fix sync and vault listing bugs

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-06 23:30:49 -04:00
parent 5a39d4c73e
commit 4092e2ecc3
11 changed files with 85 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,14 +7,11 @@
$scope.folders = [];
$scope.focusedSiteId = null;
$scope.$on("$ionicView.enter", function (event, data) {
$scope.$on('$ionicView.enter', function (event, data) {
loadVault();
});
function loadVault() {
$scope.sites = [];
$scope.folders = [];
var decSites = [];
var decFolders = [{
id: null,
@@ -25,12 +22,12 @@
siteService.getAll(function (sites) {
var promises = [];
for (var i = 0; i < folders.length; i++) {
for (var i = 1; i < folders.length; i++) {
decFolders.push({
id: folders[i].id
});
var folderNamePromise = cipherService.decrypt(sites[i].name, i);
var folderNamePromise = cipherService.decrypt(folders[i].name, i);
promises.push(folderNamePromise);
folderNamePromise.then(function (obj) {
decFolders[obj.index].name = obj.val;
@@ -65,6 +62,14 @@
});
}
$scope.folderSort = function (item) {
if (!item.id) {
return '';
}
return item.name.toLowerCase();
};
$scope.viewSite = function (site) {
$scope.focusedSiteId = site.id;
$ionicModal.fromTemplateUrl('app/vault/views/vaultViewSite.html', {
@@ -111,7 +116,7 @@
$scope.focusedSiteId = null;
};
$scope.$on('modal.hidden', function () {
$scope.$on('closeViewSite.hidden', function () {
console.log('modal hidden');
loadVault();
});