mirror of https://github.com/keeweb/keeweb.git
Merge branch 'release-1.18'
This commit is contained in:
commit
9e4c0f5c47
|
@ -246,7 +246,7 @@ const AutoType = {
|
|||
},
|
||||
|
||||
processEventWithFilter(evt) {
|
||||
const entries = evt.filter.getEntries();
|
||||
let entries = evt.filter.getEntries();
|
||||
if (entries.length === 1 && AppSettingsModel.directAutotype) {
|
||||
this.hideWindow(() => {
|
||||
this.runAndHandleResult({ entry: entries[0] }, evt.windowInfo.id);
|
||||
|
@ -255,6 +255,19 @@ const AutoType = {
|
|||
}
|
||||
this.focusMainWindow();
|
||||
|
||||
if (entries.length === 0) {
|
||||
if (evt.filter.useUrl) {
|
||||
evt.filter.useUrl = false;
|
||||
if (evt.filter.title) {
|
||||
evt.filter.useTitle = true;
|
||||
}
|
||||
}
|
||||
entries = evt.filter.getEntries();
|
||||
if (entries.length === 0 && evt.filter.useTitle) {
|
||||
evt.filter.useTitle = false;
|
||||
}
|
||||
}
|
||||
|
||||
const humanReadableTarget = evt.filter.title || evt.filter.url;
|
||||
const topMessage = humanReadableTarget
|
||||
? Locale.autoTypeMsgMatchedByWindow.replace('{}', humanReadableTarget)
|
||||
|
|
|
@ -522,7 +522,7 @@ const ProtocolHandlers = {
|
|||
}
|
||||
|
||||
const otpPromise = new Promise((resolve, reject) => {
|
||||
selectEntryFieldView.on('result', () => reject(makeError(Errors.userRejected)));
|
||||
selectEntryFieldView?.on('result', () => reject(makeError(Errors.userRejected)));
|
||||
entry.otpGenerator.next((err, otp) => {
|
||||
if (otp) {
|
||||
resolve(otp);
|
||||
|
@ -536,9 +536,7 @@ const ProtocolHandlers = {
|
|||
try {
|
||||
totp = await otpPromise;
|
||||
} finally {
|
||||
if (selectEntryFieldView) {
|
||||
selectEntryFieldView.remove();
|
||||
}
|
||||
selectEntryFieldView?.remove();
|
||||
}
|
||||
|
||||
return encryptResponse(request, {
|
||||
|
|
|
@ -78,6 +78,7 @@
|
|||
&__table {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
height: 0;
|
||||
overflow: hidden;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "KeeWeb",
|
||||
"version": "1.18.2",
|
||||
"version": "1.18.3",
|
||||
"description": "Free cross-platform password manager compatible with KeePass",
|
||||
"main": "main.js",
|
||||
"homepage": "https://keeweb.info",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "keeweb",
|
||||
"version": "1.18.2",
|
||||
"version": "1.18.3",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "keeweb",
|
||||
"version": "1.18.2",
|
||||
"version": "1.18.3",
|
||||
"description": "Free cross-platform password manager compatible with KeePass",
|
||||
"main": "Gruntfile.js",
|
||||
"private": true,
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
Release notes
|
||||
-------------
|
||||
##### v1.18.3 (2021-05-09)
|
||||
`-` fix #1804: filling OTP in browser extensions
|
||||
`*` fix #1805: auto-unchecking auto-type filters if nothing found
|
||||
|
||||
##### v1.18.2 (2021-05-08)
|
||||
`-` fix #1802: opening files with saved keyfiles
|
||||
|
||||
|
|
Loading…
Reference in New Issue