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

#98 proxy support for sync setup

Browse Source
This commit is contained in:
azivner
2018-07-25 08:30:41 +02:00
parent 0ece9bd1be
commit c8253caae9
7 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/public/javascripts/setup.js
View File

@@ -16,7 +16,8 @@ function SetupModel() {
this.password1 = ko.observable();
this.password2 = ko.observable();
this.serverAddress = ko.observable();
this.syncServerHost = ko.observable();
this.syncProxy = ko.observable();
this.instanceType = utils.isElectron() ? "desktop" : "server";
@@ -68,11 +69,12 @@ function SetupModel() {
});
}
else if (this.setupSyncFromServer()) {
const serverAddress = this.serverAddress();
const syncServerHost = this.syncServerHost();
const syncProxy = this.syncProxy();
const username = this.username();
const password = this.password1();
if (!serverAddress) {
if (!syncServerHost) {
showAlert("Trilium server address can't be empty");
return;
}
@@ -89,7 +91,8 @@ function SetupModel() {
// not using server.js because it loads too many dependencies
const resp = await $.post('/api/setup/sync-from-server', {
serverAddress: serverAddress,
syncServerHost: syncServerHost,
syncProxy: syncProxy,
username: username,
password: password
});