gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed setup page issues which caused wrong choice to be used in the wizard

Browse Source
This commit is contained in:
azivner 2019-01-03 22:32:36 +01:00
parent fec3e47eb8
commit e2dfe1b6de
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,26 +25,20 @@ function SetupModel() {
this.instanceType = utils.isElectron() ? "desktop" : "server"; this.instanceType = utils.isElectron() ? "desktop" : "server";
this.setupTypeSelected = this.getSetupType = () => this.setupTypeSelected = () => !!this.setupType();
this.setupNewDocument()
|| this.setupSyncFromDesktop()
|| this.setupSyncFromServer();
this.selectSetupType = () => { this.selectSetupType = () => {
this.step(this.getSetupType()); this.step(this.setupType());
this.setupType(this.getSetupType());
}; };
this.back = () => { this.back = () => {
this.step("setup-type"); this.step("setup-type");
this.setupNewDocument(false); this.setupType("");
this.setupSyncFromServer(false);
this.setupSyncFromDesktop(false);
}; };
this.finish = async () => { this.finish = async () => {
if (this.setupNewDocument()) { if (this.setupType() === 'new-document') {
const username = this.username(); const username = this.username();
const password1 = this.password1(); const password1 = this.password1();
const password2 = this.password2(); const password2 = this.password2();
@ -72,7 +66,7 @@ function SetupModel() {
window.location.replace("/"); window.location.replace("/");
}); });
} }
else if (this.setupSyncFromServer()) { else if (this.setupType() === 'sync-from-server') {
const syncServerHost = this.syncServerHost(); const syncServerHost = this.syncServerHost();
const syncProxy = this.syncProxy(); const syncProxy = this.syncProxy();
const username = this.username(); const username = this.username();

6
src/views/setup.ejs
View File

@ -13,15 +13,15 @@
<div id="setup-type" data-bind="visible: step() == 'setup-type'" style="margin-top: 20px;"> <div id="setup-type" data-bind="visible: step() == 'setup-type'" style="margin-top: 20px;">
<div class="radio" style="margin-bottom: 15px;"> <div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupNewDocument"> <label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupType">
I'm a new user and I want to create new Trilium document for my notes</label> I'm a new user and I want to create new Trilium document for my notes</label>
</div> </div>
<div class="radio" data-bind="if: instanceType == 'server'" style="margin-bottom: 15px;"> <div class="radio" data-bind="if: instanceType == 'server'" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupSyncFromDesktop"> <label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupType">
I have desktop instance already and I want to setup sync with it</label> I have desktop instance already and I want to setup sync with it</label>
</div> </div>
<div class="radio" data-bind="if: instanceType == 'desktop'" style="margin-bottom: 15px;"> <div class="radio" data-bind="if: instanceType == 'desktop'" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupSyncFromServer"> <label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupType">
I have server instance up and I want to setup sync with it</label> I have server instance up and I want to setup sync with it</label>
</div> </div>