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

unblocking infinite cycle

Browse Source
This commit is contained in:
azivner 2018-03-25 13:13:26 -04:00
parent 299252b650
commit d746d707b5
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/dialogs/recent_notes.js
View File

@ -90,7 +90,7 @@ function showDialog() {
}); });
} }
reload(); setTimeout(reload, 100);
$(document).bind('keydown', 'ctrl+e', e => { $(document).bind('keydown', 'ctrl+e', e => {
showDialog(); showDialog();

26
src/public/javascripts/services/server.js
View File

@ -62,18 +62,6 @@ async function call(method, url, data) {
} }
} }
if (utils.isElectron()) {
const ipc = require('electron').ipcRenderer;
ipc.on('server-response', (event, arg) => {
console.log(utils.now(), "Response #" + arg.requestId + ": " + arg.statusCode);
reqResolves[arg.requestId](arg.body);
delete reqResolves[arg.requestId];
});
}
async function ajax(url, method, data) { async function ajax(url, method, data) {
const options = { const options = {
url: baseApiUrl + url, url: baseApiUrl + url,
@ -93,6 +81,20 @@ async function ajax(url, method, data) {
}); });
} }
setTimeout(() => {
if (utils.isElectron()) {
const ipc = require('electron').ipcRenderer;
ipc.on('server-response', (event, arg) => {
console.log(utils.now(), "Response #" + arg.requestId + ": " + arg.statusCode);
reqResolves[arg.requestId](arg.body);
delete reqResolves[arg.requestId];
});
}
}, 100);
export default { export default {
get, get,
post, post,