prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2258 from keepassxreboot/fix/show_group_name_in_autocomplete

Browse source 
Fix showing group name in Autocomplete Menu
This commit is contained in:
Sami Vänttinen 2024-07-01 14:49:18 +03:00 committed by GitHub
commit dfebca27ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
keepassxc-browser/content/keepassxc-browser.js
View file

@ -267,6 +267,8 @@ kpxc.initAutocomplete = function() {
return;
}
const showGroupNameInAutocomplete = kpxc.showGroupNameInAutocomplete();
for (const c of kpxc.combinations) {
if (c.username) {
kpxcUserAutocomplete.create(
@ -274,7 +276,7 @@ kpxc.initAutocomplete = function() {
false,
kpxc.settings.autoSubmit,
kpxc.settings.useCompactMode,
kpxc.settings.showGroupNameInAutocomplete,
showGroupNameInAutocomplete,
kpxc.settings.afterFillSorting,
);
} else if (!c.username && c.password) {
@ -284,7 +286,7 @@ kpxc.initAutocomplete = function() {
false,
kpxc.settings.autoSubmit,
kpxc.settings.useCompactMode,
kpxc.settings.showGroupNameInAutocomplete,
showGroupNameInAutocomplete,
kpxc.settings.afterFillSorting,
);
}
@ -295,7 +297,7 @@ kpxc.initAutocomplete = function() {
false,
kpxc.settings.autoSubmit,
kpxc.settings.useCompactMode,
kpxc.settings.showGroupNameInAutocomplete,
showGroupNameInAutocomplete,
kpxc.settings.afterFillSortingTotp,
);
}
@ -424,8 +426,7 @@ kpxc.initLoginPopup = function() {
: first.localeCompare(second);
};
const showGroupNameInAutocomplete =
kpxc.settings.showGroupNameInAutocomplete && kpxc.getUniqueGroupCount(kpxc.credentials) > 1;
const showGroupNameInAutocomplete = kpxc.showGroupNameInAutocomplete();
// Initialize login items
const loginItems = [];
@ -461,7 +462,7 @@ kpxc.initLoginPopup = function() {
popupLoginItems.push({ text: l.text, uuid: l.uuid });
kpxcUserAutocomplete.elements.push({
group: l.group,
group: showGroupNameInAutocomplete ? l.group : undefined,
title: l.title,
label: l.text,
value: l.login,
@ -536,8 +537,7 @@ kpxc.rememberCredentials = async function(usernameValue, passwordValue, urlValue
}
}
const showGroupNameInAutocomplete =
kpxc.settings.showGroupNameInAutocomplete && kpxc.getUniqueGroupCount(credentials) > 1;
const showGroupNameInAutocomplete = kpxc.showGroupNameInAutocomplete();
const credentialsList = [];
for (const c of credentials) {
@ -742,6 +742,11 @@ kpxc.setValueWithChange = function(field, value, forced = false) {
dispatchLegacyEvent(field, 'change');
};
kpxc.showGroupNameInAutocomplete = function() {
return !kpxc.settings.useCompactMode
|| (kpxc.settings.showGroupNameInAutocomplete && kpxc.getUniqueGroupCount(kpxc.credentials) > 1);
};
// Returns true if site is ignored
kpxc.siteIgnored = async function(condition) {
if (kpxc.settings.sitePreferences) {