diff --git a/package-lock.json b/package-lock.json index 14681c0fe..871603bab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.34.0-beta", + "version": "0.34.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -114,14 +114,14 @@ } }, "@electron/get": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.3.1.tgz", - "integrity": "sha512-FozkPRcRbHmuXh/qnry+s/GJ84hRAaUuEYYfZHvEl8n9X7a4ndhh1tVF+w4gky69XP+KHlLEO+OR95WqDy2mfg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.4.0.tgz", + "integrity": "sha512-FN20Sj0shfHsInfYWQ2ERG/UgyTMNK92WBwl3k9qcIOCZ5Kfz+PwoO29x7lEnEEDONSwlEvHEUs0dJqfqrpEuA==", "dev": true, "requires": { "debug": "^4.1.1", "env-paths": "^2.2.0", - "fs-extra": "^7.0.1", + "fs-extra": "^8.1.0", "got": "^9.6.0", "sumchecker": "^3.0.0" }, @@ -170,17 +170,6 @@ "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", "dev": true }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -900,6 +889,12 @@ "requires": { "path-parse": "^1.0.6" } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true } } }, @@ -3113,9 +3108,9 @@ "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==" }, "electron": { - "version": "6.0.0-beta.14", - "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.14.tgz", - "integrity": "sha512-tQ0zQAAn1HEMyCor8R+zs6Ka0KXfzjeaJIlkIYbihG4nTtctES/y0GIMB1tYhkz6kqgjfUuYkOl4wAm8F0cbAQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0.tgz", + "integrity": "sha512-JVHj0dYtvVFrzVk1TgvrdXJSyLpdvlWNLhtG8ItYZsyg9XbCOQ9OoPfgLm04FjMzKMzEl4YIN0PfGC02MTx3PQ==", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -3878,9 +3873,9 @@ } }, "electron-osx-sign": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz", - "integrity": "sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ==", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.12.tgz", + "integrity": "sha512-L/+VcwO76EtP+E4Gh/HJH0exaKeYLPZlNNBFdl+Vw3il9jRBRjInpqtegLAu8t/cGGJn+tZ47Uc6mymQYNpJ6g==", "dev": true, "requires": { "bluebird": "^3.5.0", @@ -3912,9 +3907,9 @@ } }, "electron-packager": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.0.2.tgz", - "integrity": "sha512-QJyttK+GlgJFwjueOpGWN7gZ67WsHkstzCieAyojiw6mLzdBz54q+2oZidF7GfB8bkWVxsMUQa7WrHV13e2eQw==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.0.4.tgz", + "integrity": "sha512-YTZHPU2PESY86BAmTxJ8VVOvwsE2Tc/NUuBYoo/F8Qj4t4GNGBVy5VfusxEem9g7Fnn0uS9KFN60fn/OlzRaMw==", "dev": true, "requires": { "@electron/get": "^1.3.0", @@ -9071,9 +9066,9 @@ "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==" }, "node-abi": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.9.0.tgz", - "integrity": "sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.10.0.tgz", + "integrity": "sha512-OT0WepUvYHXdki6DU8LWhEkuo3M44i2paWBYtH9qXtPb9YiKlYEKa5WUII20XEcOv7UJPzfB0kZfPZdW46zdkw==", "requires": { "semver": "^5.4.1" }, diff --git a/src/public/javascripts/mobile.js b/src/public/javascripts/mobile.js index 7e33f7aeb..8e4255fca 100644 --- a/src/public/javascripts/mobile.js +++ b/src/public/javascripts/mobile.js @@ -75,6 +75,16 @@ async function showTree() { }, clones: { highlightActiveClones: true + }, + // this is done to automatically lazy load all expanded search notes after tree load + loadChildren: (event, data) => { + data.node.visit((subNode) => { + // Load all lazy/unloaded child nodes + // (which will trigger `loadChildren` recursively) + if (subNode.isUndefined() && subNode.isExpanded()) { + subNode.load(); + } + }); } }); } diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js index 2e625119e..1cc5093dc 100644 --- a/src/public/javascripts/services/tree.js +++ b/src/public/javascripts/services/tree.js @@ -484,11 +484,11 @@ function initFancyTree(tree) { } }, // this is done to automatically lazy load all expanded search notes after tree load - loadChildren: function(event, data) { - data.node.visit(function(subNode){ + loadChildren: (event, data) => { + data.node.visit((subNode) => { // Load all lazy/unloaded child nodes // (which will trigger `loadChildren` recursively) - if( subNode.isUndefined() && subNode.isExpanded() ) { + if (subNode.isUndefined() && subNode.isExpanded()) { subNode.load(); } });