colin/browserpass-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort full list (#13)

Browse Source 
* Sort full list
* Make code clearer
This commit is contained in:
Erayd
2018-04-22 02:34:06 +12:00
committed by GitHub
parent aab9dc3f5b
commit 2f6efa0ba4
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/popup/interface.js
View File

@@ -165,19 +165,26 @@ function search(s) {
var candidates = this.logins.map(result => Object.assign(result, { display: result.login }));
if (this.currentDomainOnly) {
var recent = candidates.filter(login => login.recent.count > 0);
recent.sort(function(a, b) {
if (a.store.when != b.store.when) {
return b.store.when - a.store.when;
}
if (a.recent.count != b.recent.count) {
return b.recent.count - a.recent.count;
}
return b.recent.when - a.recent.when;
});
candidates = recent.concat(
candidates.filter(login => login.inCurrentDomain && !login.recent.count)
var remainingInCurrentDomain = candidates.filter(
login => login.inCurrentDomain && !login.recent.count
);
candidates = recent.concat(remainingInCurrentDomain);
}
candidates.sort(function(a, b) {
if (a.store.when != b.store.when) {
return b.store.when - a.store.when;
}
if (a.recent.count != b.recent.count) {
return b.recent.count - a.recent.count;
}
if (a.recent.when != b.recent.when) {
return b.recent.when - a.recent.when;
}
if (a.store.name != b.store.name) {
return a.store.name.localeCompare(b.store.name);
}
return a.login.localeCompare(b.login);
});
if (s.length) {
var filter = s.split(/\s+/);