Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-31 08:20:37 +01:00
Code Issues Projects Releases Wiki Activity

do api calls on viewContentLoaded

Browse Source
This commit is contained in:
Kyle Spearrin 2017-03-07 00:36:27 -05:00
parent 22299c03cd
commit 3d273f041e
4 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/global/mainController.js
View File

@ -6,11 +6,12 @@ angular
vm.bodyClass = '';
vm.searchVaultText = null;
vm.version = appSettings.version;
vm.userProfile = authService.getUserProfile();
$scope.currentYear = new Date().getFullYear();
$scope.$on('$viewContentLoaded', function () {
vm.userProfile = authService.getUserProfile();
if ($.AdminLTE) {
if ($.AdminLTE.layout) {
$.AdminLTE.layout.fix();

4
src/app/organization/organizationPeopleController.js
View File

@ -3,7 +3,9 @@
.controller('organizationPeopleController', function ($scope, $state, $uibModal, cryptoService, apiService, toastr) {
$scope.users = [];
loadList();
$scope.$on('$viewContentLoaded', function () {
loadList();
});
$scope.confirm = function (user) {
apiService.users.getPublicKey({ id: user.userId }, function (userKey) {

42
src/app/settings/settingsController.js
View File

@ -8,28 +8,30 @@
email: null
};
apiService.accounts.getProfile({}, function (user) {
$scope.model = {
profile: {
name: user.Name,
masterPasswordHint: user.MasterPasswordHint,
culture: user.Culture
},
email: user.Email,
twoFactorEnabled: user.TwoFactorEnabled
};
$scope.$on('$viewContentLoaded', function () {
apiService.accounts.getProfile({}, function (user) {
$scope.model = {
profile: {
name: user.Name,
masterPasswordHint: user.MasterPasswordHint,
culture: user.Culture
},
email: user.Email,
twoFactorEnabled: user.TwoFactorEnabled
};
if (user.Organizations) {
var orgs = [];
for (var i = 0; i < user.Organizations.length; i++) {
orgs.push({
id: user.Organizations[i].Id,
name: user.Organizations[i].Name
});
if (user.Organizations) {
var orgs = [];
for (var i = 0; i < user.Organizations.length; i++) {
orgs.push({
id: user.Organizations[i].Id,
name: user.Organizations[i].Name
});
}
$scope.model.organizations = orgs;
}
$scope.model.organizations = orgs;
}
});
});
$scope.generalSave = function () {

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

@ -7,28 +7,30 @@
$scope.folders = [];
$scope.loading = true;
apiService.ciphers.list({}, function (ciphers) {
$scope.loading = false;
$scope.$on('$viewContentLoaded', function () {
apiService.ciphers.list({}, function (ciphers) {
$scope.loading = false;
var decLogins = [];
var decFolders = [{
id: null,
name: '(none)'
}];
var decLogins = [];
var decFolders = [{
id: null,
name: '(none)'
}];
for (var i = 0; i < ciphers.Data.length; i++) {
if (ciphers.Data[i].Type === 0) {
var decFolder = cipherService.decryptFolderPreview(ciphers.Data[i]);
decFolders.push(decFolder);
for (var i = 0; i < ciphers.Data.length; i++) {
if (ciphers.Data[i].Type === 0) {
var decFolder = cipherService.decryptFolderPreview(ciphers.Data[i]);
decFolders.push(decFolder);
}
else {
var decLogin = cipherService.decryptLoginPreview(ciphers.Data[i]);
decLogins.push(decLogin);
}
}
else {
var decLogin = cipherService.decryptLoginPreview(ciphers.Data[i]);
decLogins.push(decLogin);
}
}
$scope.folders = decFolders;
$scope.logins = decLogins;
$scope.folders = decFolders;
$scope.logins = decLogins;
});
});
$scope.folderSort = function (item) {