bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-23 19:53:16 +00:00
Code Issues Releases Wiki Activity

loading switches for cipher and groupings

Browse Source
This commit is contained in:
Kyle Spearrin
2018-03-19 11:28:23 -04:00
parent 4ccd9501a8
commit 7a50c0536c
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/vault/vaultController.js
View File

@@ -3,7 +3,8 @@
.controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr,
cipherService, $q, $localStorage, $timeout, $rootScope, $state, $analytics, constants, validationService) {
$scope.loading = true;
$scope.loadingCiphers = true;
$scope.loadingGroupings = true;
$scope.ciphers = [];
$scope.folders = [];
$scope.collections = [];
@@ -29,7 +30,7 @@
}, 500);
if (($rootScope.vaultFolders || $rootScope.vaultCollections) && $rootScope.vaultCiphers) {
$scope.loading = false;
$scope.loadingCiphers = $scope.loadingGroupings = false;
loadCipherData($rootScope.vaultCiphers);
return;
}
@@ -62,9 +63,10 @@
var groupingPromise = $q.all([collectionPromise, folderPromise]).then(function () {
$rootScope.vaultCollections = decCollections;
$rootScope.vaultFolders = decFolders;
$scope.loadingGroupings = false;
});
var cipherPromise = apiService.ciphers.list({}, function (ciphers) {
apiService.ciphers.list({}, function (ciphers) {
var decCiphers = [];
for (var i = 0; i < ciphers.Data.length; i++) {
@@ -76,14 +78,11 @@
loadCipherData(decCiphers);
});
}).$promise;
$q.all([cipherPromise, groupingPromise]).then(function () {
$scope.loading = false;
});
}
function loadCipherData(decCiphers) {
$rootScope.vaultCiphers = $scope.ciphers = $filter('orderBy')(decCiphers, ['sort', 'name', 'subTitle']);
$scope.loadingCiphers = false;
var chunks = chunk($rootScope.vaultCiphers, 400);
if (chunks.length > 0) {