gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 19:49:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix setup on non-root paths #404

Browse Source
This commit is contained in:
zadam 2019-11-22 20:24:49 +01:00
parent 522f71cb91
commit a16aaf7a81
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "trilium",
"version": "0.37.2",
"version": "0.37.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

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

@ -76,12 +76,12 @@ function SetupModel() {
}
// not using server.js because it loads too many dependencies
$.post('/api/setup/new-document', {
$.post('api/setup/new-document', {
username: username,
password: password1,
theme: theme
}).then(() => {
window.location.replace("/");
window.location.replace("./");
});
}
else if (this.setupType() === 'sync-from-server') {
@ -128,10 +128,10 @@ function SetupModel() {
}
async function checkOutstandingSyncs() {
const { stats, initialized } = await $.get('/api/sync/stats');
const { stats, initialized } = await $.get('api/sync/stats');
if (initialized) {
window.location.replace("/");
window.location.replace("./");
}
const totalOutstandingSyncs = stats.outstandingPushes + stats.outstandingPulls;

1
src/views/setup.ejs
View File

@ -138,7 +138,6 @@
</div>
<script type="text/javascript">
const baseApiUrl = 'api/';
const glob = {
sourceId: ''
};