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

fixing non-root path issues, #404

Browse Source
This commit is contained in:
zadam 2019-11-25 21:44:46 +01:00
parent 434d8ef48c
commit bf9ad976b9
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

2
libraries/springy.js
View File

@ -498,7 +498,7 @@
t._started = false; t._started = false;
onRenderStop(); onRenderStop();
} else { } else {
setImmediate(step); requestIdleCallback(step, { timeout: 10 });
} }
} }

2
package-lock.json generated
View File

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

8
src/public/javascripts/services/ws.js
View File

@ -127,11 +127,13 @@ async function consumeSyncData() {
} }
function connectWebSocket() { function connectWebSocket() {
const protocol = document.location.protocol === 'https:' ? 'wss' : 'ws'; const loc = window.location;
const webSocketUri = (loc.protocol === "https:" ? "wss:" : "ws:")
+ "//" + loc.host + loc.pathname;
// use wss for secure messaging // use wss for secure messaging
const ws = new WebSocket(protocol + "://" + location.host); const ws = new WebSocket(webSocketUri);
ws.onopen = () => console.debug(utils.now(), "Connected to server with WebSocket"); ws.onopen = () => console.debug(utils.now(), `Connected to server ${webSocketUri} with WebSocket`);
ws.onmessage = handleMessage; ws.onmessage = handleMessage;
// we're not handling ws.onclose here because reconnection is done in sendPing() // we're not handling ws.onclose here because reconnection is done in sendPing()