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 #1156 from keepassxreboot/fix/small_fixes_for_174

Browse source 
Small fixes for 1.7.4
This commit is contained in:
Sami Vänttinen 2020-12-21 20:48:03 +02:00 committed by GitHub
commit 880bad5469
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -762,7 +762,7 @@ kpxc.fillInFromActiveElement = async function(passOnly = false) {
if (kpxc.credentials.length > 1) {
// More than one credential -> show autocomplete list
kpxcAutocomplete.showList(field);
return
return;
} else {
// Just one credential -> fill the first combination found
kpxc.fillInCredentials(combination, kpxc.credentials[0].login, kpxc.credentials[0].uuid, passOnly);

10
keepassxc-browser/options/shortcuts.js
View file

@ -16,7 +16,7 @@ const keyOptions = [
// From chrome://mozapps/content/extensions/shortcuts.js
const validKeys = new Set([
'Home', 'End', 'PageUp', 'PageDown', 'Insert', 'Delete', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'F1', 'F2', 'F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'F10', 'F11', 'F12' ,
'F1', 'F2', 'F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'F10', 'F11', 'F12',
'MediaNextTrack', 'MediaPlayPause', 'MediaPrevTrack', 'MediaStop',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'Up', 'Down', 'Left', 'Right', 'Comma', 'Period', 'Space'
@ -45,7 +45,7 @@ function remapKey(string) {
// Modified from chrome://mozapps/content/extensions/shortcuts.js
function getStringForEvent(event) {
for (let option of keyOptions) {
for (const option of keyOptions) {
const value = option(event);
if (validKeys.has(value)) {
return value;
@ -75,15 +75,15 @@ function getShortcutForEvent(e) {
}
return Object.entries(modifierMap)
.filter(([key, isDown]) => isDown)
.map(([key]) => key)
.filter(([ key, isDown ]) => isDown)
.map(([ key ]) => key)
.concat(getStringForEvent(e))
.join('+');
}
// Modified from chrome://mozapps/content/extensions/shortcuts.js
function shortCutChanged(e) {
let input = e.target;
const input = e.target;
if (e.key === 'Escape') {
input.blur();