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

Refactored rename of Sites => Logins

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-03 18:40:07 -05:00
parent fcce60eccd
commit fb486003b5
34 changed files with 601 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
angular
.module('bit.vault')
.controller('vaultController', function ($scope, $rootScope, siteService, folderService, $q, $state, $stateParams, toastr,
.controller('vaultController', function ($scope, $rootScope, loginService, folderService, $q, $state, $stateParams, toastr,
syncService, utilsService, $analytics, i18nService, stateService, $timeout) {
var stateKey = 'vault',
state = stateService.getState(stateKey) || {};
@@ -20,8 +20,8 @@
var delayLoad = true;
$scope.loaded = true;
if (!$rootScope.vaultSites) {
$rootScope.vaultSites = [];
if (!$rootScope.vaultLogins) {
$rootScope.vaultLogins = [];
delayLoad = false;
}
if (!$rootScope.vaultFolders) {
@@ -40,7 +40,7 @@
function loadVault() {
var decFolders = [];
var decSites = [];
var decLogins = [];
var promises = [];
var folderPromise = $q.when(folderService.getAllDecrypted());
@@ -49,16 +49,16 @@
});
promises.push(folderPromise);
var sitePromise = $q.when(siteService.getAllDecrypted());
sitePromise.then(function (sites) {
decSites = sites;
var loginPromise = $q.when(loginService.getAllDecrypted());
loginPromise.then(function (logins) {
decLogins = logins;
});
promises.push(sitePromise);
promises.push(loginPromise);
$q.all(promises).then(function () {
$scope.loaded = true;
$rootScope.vaultFolders = decFolders;
$rootScope.vaultSites = decSites;
$rootScope.vaultLogins = decLogins;
if (!delayLoad) {
setScrollY();
@@ -79,41 +79,41 @@
return item.name.toLowerCase();
};
$scope.searchSites = function () {
$scope.searchLogins = function () {
if (!$scope.searchText || $scope.searchText.length < 2) {
return;
}
return searchSite;
return searchLogin;
};
function searchSite(site) {
function searchLogin(login) {
var searchTerm = $scope.searchText.toLowerCase();
if (site.name && site.name.toLowerCase().indexOf(searchTerm) !== -1) {
if (login.name && login.name.toLowerCase().indexOf(searchTerm) !== -1) {
return true;
}
if (site.username && site.username.toLowerCase().indexOf(searchTerm) !== -1) {
if (login.username && login.username.toLowerCase().indexOf(searchTerm) !== -1) {
return true;
}
if (site.uri && site.uri.toLowerCase().indexOf(searchTerm) !== -1) {
if (login.uri && login.uri.toLowerCase().indexOf(searchTerm) !== -1) {
return true;
}
return false;
}
$scope.addSite = function () {
$scope.addLogin = function () {
storeState();
$state.go('addSite', {
$state.go('addLogin', {
animation: 'in-slide-up',
from: 'vault'
});
};
$scope.viewSite = function (site) {
$scope.viewLogin = function (login) {
storeState();
$state.go('viewSite', {
siteId: site.id,
$state.go('viewLogin', {
loginId: login.id,
animation: 'in-slide-up',
from: 'vault'
});