Merge branch 'master' into develop

This commit is contained in:
antelle 2020-04-11 18:29:15 +02:00
commit 73ac7496e2
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
7 changed files with 14 additions and 9 deletions

View File

@ -317,6 +317,8 @@ Events.on('app-ready', () =>
}, 0)
);
global.Events = Events;
Launcher.remoteApp().on('remote-app-event', e => {
Events.emit(e.name, e.data);
});
export { Launcher };

View File

@ -347,10 +347,10 @@ function mainWindowFocus() {
function emitRemoteEvent(e, arg) {
if (mainWindow && mainWindow.webContents) {
arg = JSON.stringify(arg);
mainWindow.webContents.executeJavaScript(
`window.Events && Events.emit('${e}', ${arg}); void 0;`
);
app.emit('remote-app-event', {
name: e,
data: arg
});
}
}

View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.13.2",
"version": "1.13.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.13.2",
"version": "1.13.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "main.js",
"homepage": "https://keeweb.info",

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.13.2",
"version": "1.13.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.13.2",
"version": "1.13.3",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,

View File

@ -1,5 +1,8 @@
Release notes
-------------
##### v1.13.3 (2020-04-11)
`-` fix #1451: fixed slow global auto-type on desktop
##### v1.13.2 (2020-04-09)
`+` files previously created as v4.1 will be written as v4.0
`+` fixed Docker build