Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

fix sync

Browse Source
This commit is contained in:
zadam
2020-06-13 22:34:15 +02:00
parent 5d47c2b23e
commit 0df7851214
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -3345,9 +3345,9 @@
}
},
"electron": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/electron/-/electron-9.0.3.tgz",
"integrity": "sha512-rY59wy50z0oWp/q69zq0UIzvtcM5j2BJbLAwEoLfVNS3DLt9wDZqRqSIBvLEBl+xWbafCnRA9haEqi7ssM94GA==",
"version": "9.0.4",
"resolved": "https://registry.npmjs.org/electron/-/electron-9.0.4.tgz",
"integrity": "sha512-QzkeZNAiNB7KxcdoQKSoaiVT/GQdB4Vt0/ZZOuU8tIKABAsni2I7ztiAbUzxcsnQsqEBSfChuPuDQ5A4VbbzPg==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",

2
package.json
View File

@@ -78,7 +78,7 @@
"yazl": "^2.5.1"
},
"devDependencies": {
"electron": "9.0.3",
"electron": "9.0.4",
"electron-builder": "22.6.0",
"electron-packager": "14.2.1",
"electron-rebuild": "1.10.1",

4
src/public/app/services/utils.js
View File

@@ -320,10 +320,10 @@ function timeLimit(promise, limitMs) {
return new Promise((res, rej) => {
let resolved = false;
promise.then(() => {
promise.then(result => {
resolved = true;
res();
res(result);
});
setTimeout(() => {

4
src/services/utils.js
View File

@@ -221,10 +221,10 @@ function timeLimit(promise, limitMs) {
return new Promise((res, rej) => {
let resolved = false;
promise.then(() => {
promise.then(result => {
resolved = true;
res();
res(result);
});
setTimeout(() => {