Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

fix frontend reload again

Browse Source
This commit is contained in:
zadam
2019-06-26 20:49:17 +02:00
parent 20d3d61cec
commit 7c77ae758b
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electron.js
View File

@@ -74,7 +74,7 @@ async function createMainWindow() {
const parsedUrl = url.parse(targetUrl); const parsedUrl = url.parse(targetUrl);
// we still need to allow internal redirects from setup and migration pages // we still need to allow internal redirects from setup and migration pages
if (parsedUrl.hostname !== 'localhost' || parsedUrl.hostname !== '127.0.0.1' || (parsedUrl.path && parsedUrl.path !== '/')) { if (!['localhost', '127.0.0.1'].includes(parsedUrl.hostname) || (parsedUrl.path && parsedUrl.path !== '/')) {
ev.preventDefault(); ev.preventDefault();
} }
}); });

8
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.33.2-beta", "version": "0.33.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -2820,9 +2820,9 @@
"integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==" "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
}, },
"electron": { "electron": {
"version": "6.0.0-beta.10", "version": "6.0.0-beta.11",
"resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.10.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.11.tgz",
"integrity": "sha512-eKDUv5ZZGjFE2ccBQzBpY6j3oT1NvnHGLcSoGXp6vCWkx+ZYjPyujwG3gW61FK7iL5FMKyg9IlhCOsIy4HEruw==", "integrity": "sha512-B6zh9c5pJ0BKKNkOEbF6vKXnBCWgtvY8LaUYDNeR9ttnPP0CCm0oovIoqP9/nN5gL8rlCoCgKWsjmiHu0jg7mA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^10.12.18", "@types/node": "^10.12.18",

2
package.json
View File

@@ -75,7 +75,7 @@
}, },
"devDependencies": { "devDependencies": {
"devtron": "1.4.0", "devtron": "1.4.0",
"electron": "6.0.0-beta.10", "electron": "6.0.0-beta.11",
"electron-builder": "20.44.2", "electron-builder": "20.44.2",
"electron-compile": "6.4.4", "electron-compile": "6.4.4",
"electron-installer-debian": "2.0.0", "electron-installer-debian": "2.0.0",

11
src/public/javascripts/services/messaging.js
View File

@@ -88,10 +88,13 @@ setTimeout(() => {
console.log("Lost connection to server"); console.log("Lost connection to server");
} }
ws.send(JSON.stringify({ try {
type: 'ping', ws.send(JSON.stringify({
lastSyncId: lastSyncId type: 'ping',
})); lastSyncId: lastSyncId
}));
}
catch (e) {} // if the connection is closed then this produces a lot of messages
}, 1000); }, 1000);
}, 0); }, 0);