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 #2690 from keepassxreboot/fix/popovers_with_firefox_esr

Browse source 
Fix using popovers with Firefox ESR 115
This commit is contained in:
Sami Vänttinen 2025-09-15 18:11:29 +03:00 committed by GitHub
commit bbff228b40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 50 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
keepassxc-browser/content/autocomplete.js
View file

@ -130,7 +130,9 @@ class Autocomplete {
this.updateList();
this.container.classList.add('kpxcAutocomplete-container--visible');
this.container.showPopover({ source: inputField });
if (kpxcFields.popoverSupported) {
this.container.showPopover({ source: inputField });
}
this.updatePosition();
}
@ -238,7 +240,9 @@ class Autocomplete {
}
this.container.classList.remove('kpxcAutocomplete-container--visible');
this.container.hidePopover();
if (kpxcFields.popoverSupported) {
this.container.hidePopover();
}
}
getAllItems() {

3
keepassxc-browser/content/fields.js
View file

@ -9,6 +9,7 @@ const MAX_SEGMENTED_FIELD_LENGTH = 100;
* Provides methods for input field handling.
*/
const kpxcFields = {};
kpxcFields.popoverSupported = true;
// Returns all username & password combinations detected from the inputs.
// After username field is detected, first password field found after that will be saved as a combination.
@ -438,6 +439,7 @@ kpxcFields.discoverOverlays = function() {
} catch (e) {
// Ignore SyntaxError (e.g., unsupported selector)
if (!(e instanceof SyntaxError)) {
kpxcFields.popoverSupported = false;
logError(e);
}
}
@ -450,6 +452,7 @@ kpxcFields.hasOverlay = function(elem) {
} catch (e) {
// Ignore SyntaxError (e.g., unsupported selector)
if (!(e instanceof SyntaxError)) {
kpxcFields.popoverSupported = false;
logError(e);
}
}

16
keepassxc-browser/content/pwgen.js
View file

@ -60,7 +60,11 @@ PasswordIcon.prototype.createIcon = function(field) {
'popover': 'manual'
});
icon.style.margin = 0;
if (kpxcFields.popoverSupported) {
icon.style.margin = 0;
} else {
icon.style.zIndex = '10000000';
}
icon.style.width = Pixels(size);
icon.style.height = Pixels(size);
@ -74,7 +78,11 @@ PasswordIcon.prototype.createIcon = function(field) {
}
if (e.shiftKey) {
icon.hidePopover();
if (kpxcFields.popoverSupported) {
icon.hidePopover();
} else {
icon.style.display = 'none';
}
return;
}
@ -88,7 +96,9 @@ PasswordIcon.prototype.createIcon = function(field) {
kpxcUI.setIconPosition(icon, field, this.rtl);
this.icon = icon;
this.createWrapper('css/pwgen.css');
icon.showPopover();
if (kpxcFields.popoverSupported) {
icon.showPopover();
}
};

17
keepassxc-browser/content/totp-field.js
View file

@ -148,7 +148,12 @@ TOTPFieldIcon.prototype.createIcon = function(field, segmented = false) {
'size': size,
'popover': 'manual'
});
icon.style.margin = 0;
if (kpxcFields.popoverSupported) {
icon.style.margin = 0;
} else {
icon.style.zIndex = '10000000';
}
icon.style.width = Pixels(size);
icon.style.height = Pixels(size);
@ -164,7 +169,11 @@ TOTPFieldIcon.prototype.createIcon = function(field, segmented = false) {
}
if (e.shiftKey) {
icon.hidePopover();
if (kpxcFields.popoverSupported) {
icon.hidePopover();
} else {
icon.style.display = 'none';
}
return;
}
@ -179,5 +188,7 @@ TOTPFieldIcon.prototype.createIcon = function(field, segmented = false) {
kpxcUI.setIconPosition(icon, field, this.rtl, segmented);
this.icon = icon;
this.createWrapper('css/totp.css');
icon.showPopover();
if (kpxcFields.popoverSupported) {
icon.showPopover();
}
};

17
keepassxc-browser/content/username-field.js
View file

@ -83,7 +83,12 @@ UsernameFieldIcon.prototype.createIcon = function(field) {
'kpxc-pwgen-field-id': field.getAttribute('data-kpxc-id'),
'popover': 'manual'
});
icon.style.margin = 0;
if (kpxcFields.popoverSupported) {
icon.style.margin = 0;
} else {
icon.style.zIndex = '10000000';
}
icon.style.width = Pixels(size);
icon.style.height = Pixels(size);
@ -93,7 +98,11 @@ UsernameFieldIcon.prototype.createIcon = function(field) {
}
if (e.shiftKey) {
icon.hidePopover();
if (kpxcFields.popoverSupported) {
icon.hidePopover();
} else {
icon.style.display = 'none';
}
return;
}
@ -107,7 +116,9 @@ UsernameFieldIcon.prototype.createIcon = function(field) {
kpxcUI.setIconPosition(icon, field, this.rtl);
this.icon = icon;
this.createWrapper('css/username.css');
icon.showPopover();
if (kpxcFields.popoverSupported) {
icon.showPopover();
}
};
const iconClicked = async function(field, icon) {