diff --git a/apps/client/package.json b/apps/client/package.json index 42700819a3..df03795948 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -59,7 +59,7 @@ "jquery.fancytree": "2.38.5", "jsplumb": "2.15.6", "katex": "0.16.38", - "knockout": "3.5.1", + "knockout": "3.5.2", "leaflet": "1.9.4", "leaflet-gpx": "2.2.0", "mark.js": "8.11.1", diff --git a/apps/client/src/setup.ts b/apps/client/src/setup.ts index 29fbd15c00..3b3a40c336 100644 --- a/apps/client/src/setup.ts +++ b/apps/client/src/setup.ts @@ -1,7 +1,9 @@ import "jquery"; -import utils from "./services/utils.js"; + import ko from "knockout"; +import utils from "./services/utils.js"; + // TriliumNextTODO: properly make use of below types // type SetupModelSetupType = "new-document" | "sync-from-desktop" | "sync-from-server" | ""; // type SetupModelStep = "sync-in-progress" | "setup-type" | "new-document-in-progress" | "sync-from-desktop"; @@ -74,9 +76,9 @@ class SetupModel { // not using server.js because it loads too many dependencies const resp = await $.post("api/setup/sync-from-server", { - syncServerHost: syncServerHost, - syncProxy: syncProxy, - password: password + syncServerHost, + syncProxy, + password }); if (resp.result === "success") { @@ -123,6 +125,8 @@ function getSyncInProgress() { } addEventListener("DOMContentLoaded", (event) => { - ko.applyBindings(new SetupModel(getSyncInProgress()), document.getElementById("setup-dialog")); + const rootNode = document.getElementById("setup-dialog"); + if (!rootNode) return; + ko.applyBindings(new SetupModel(getSyncInProgress()), rootNode); $("#setup-dialog").show(); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ef1b6ac5d..38d41de71d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -312,8 +312,8 @@ importers: specifier: 0.16.38 version: 0.16.38 knockout: - specifier: 3.5.1 - version: 3.5.1 + specifier: 3.5.2 + version: 3.5.2 leaflet: specifier: 1.9.4 version: 1.9.4 @@ -11487,8 +11487,8 @@ packages: resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} engines: {node: '>= 8'} - knockout@3.5.1: - resolution: {integrity: sha512-wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q==} + knockout@3.5.2: + resolution: {integrity: sha512-AcJS2PqsYspjtOAlnnVS8hAuBnHMEqRVEwdvmQTeXj/9zfjV//KHurzdYc8MtBd/Pu8bZLMGHc7x0cj8qUvKxQ==} known-css-properties@0.37.0: resolution: {integrity: sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==} @@ -17560,8 +17560,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 47.4.0 ckeditor5: 47.4.0 es-toolkit: 1.39.5 - transitivePeerDependencies: - - supports-color '@ckeditor/ckeditor5-editor-multi-root@47.4.0': dependencies: @@ -29946,7 +29944,7 @@ snapshots: klona@2.0.6: {} - knockout@3.5.1: {} + knockout@3.5.2: {} known-css-properties@0.37.0: {}