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

show loading while syncing on vault list

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-22 19:26:20 -04:00
parent 3f95c3a7ea
commit c3d1d4101e
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,8 @@
angular
.module('bit.vault')
.controller('vaultController', function ($scope, $rootScope, siteService, folderService, $q, $state, $stateParams, toastr) {
.controller('vaultController', function ($scope, $rootScope, siteService, folderService, $q, $state, $stateParams, toastr,
syncService) {
$('#search').focus();
var delayLoad = true;
@@ -42,9 +43,11 @@
promises.push(sitePromise);
$q.all(promises).then(function () {
$scope.loaded = true;
$rootScope.vaultFolders = decFolders;
$rootScope.vaultSites = decSites;
if (decSites.length || !syncService.syncInProgress) {
$scope.loaded = true;
$rootScope.vaultFolders = decFolders;
$rootScope.vaultSites = decSites;
}
if (!delayLoad) {
setScrollY();
}
@@ -108,10 +111,8 @@
toastr.info(type + ' copied!');
};
$scope.$on('syncCompleted', function (event, args) {
if ($scope.loaded) {
setTimeout(loadVault, 500);
}
$scope.$on('syncCompleted', function (event, successfully) {
setTimeout(loadVault, 500);
});
function getScrollY() {