bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

vault listing page fixes

Browse Source
This commit is contained in:
Kyle Spearrin
2017-10-13 23:11:42 -04:00
parent b5c70c4941
commit 5a1bf8299f
9 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/popup/app/vault/vaultViewFolderController.js
View File

@@ -39,17 +39,17 @@
promises.push(folderDeferred.promise);
}
var loginPromise = $q.when(loginService.getAllDecryptedForFolder($scope.folder.id));
loginPromise.then(function (logins) {
var cipherPromise = loginService.getAllDecryptedForFolder($scope.folder.id);
cipherPromise.then(function (ciphers) {
if (utilsService.isEdge()) {
// Edge is super slow at sorting
decLogins = logins;
decLogins = ciphers;
}
else {
decLogins = logins.sort(loginSort);
decLogins = ciphers.sort(cipherSort);
}
});
promises.push(loginPromise);
promises.push(cipherPromise);
$q.all(promises).then(function () {
$scope.loaded = true;
@@ -68,7 +68,7 @@
});
}
function loginSort(a, b) {
function cipherSort(a, b) {
if (!a.name) {
return -1;
}
@@ -85,19 +85,19 @@
return -1;
}
if (!a.username) {
if (!a.subTitle) {
return -1;
}
if (!b.username) {
if (!b.subTitle) {
return 1;
}
var aUsername = a.username.toLowerCase(),
bUsername = b.username.toLowerCase();
if (aUsername > bUsername) {
var aSubTitle = a.subTitle.toLowerCase(),
bSubTitle = b.subTitle.toLowerCase();
if (aSubTitle > bSubTitle) {
return 1;
}
if (aUsername < bUsername) {
if (aSubTitle < bSubTitle) {
return -1;
}
@@ -123,7 +123,7 @@
var matchedLogins = [];
for (var i = 0; i < decLogins.length; i++) {
if (searchLogin(decLogins[i])) {
if (searchCipher(decLogins[i])) {
matchedLogins.push(decLogins[i]);
}
}
@@ -149,15 +149,15 @@
$scope.loadMore();
}
function searchLogin(login) {
function searchCipher(cipher) {
var searchTerm = $scope.searchText.toLowerCase();
if (login.name && login.name.toLowerCase().indexOf(searchTerm) !== -1) {
if (cipher.name && cipher.name.toLowerCase().indexOf(searchTerm) !== -1) {
return true;
}
if (login.username && login.username.toLowerCase().indexOf(searchTerm) !== -1) {
if (cipher.subTitle && cipher.subTitle.toLowerCase().indexOf(searchTerm) !== -1) {
return true;
}
if (login.uri && login.uri.toLowerCase().indexOf(searchTerm) !== -1) {
if (cipher.login && cipher.login.uri && cipher.login.uri.toLowerCase().indexOf(searchTerm) !== -1) {
return true;
}