From d746d707b5a4330aefbc497112c7259055fdab76 Mon Sep 17 00:00:00 2001 From: azivner Date: Sun, 25 Mar 2018 13:13:26 -0400 Subject: [PATCH] unblocking infinite cycle --- .../javascripts/dialogs/recent_notes.js | 2 +- src/public/javascripts/services/server.js | 26 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/public/javascripts/dialogs/recent_notes.js b/src/public/javascripts/dialogs/recent_notes.js index 90b446550..4b0d34c15 100644 --- a/src/public/javascripts/dialogs/recent_notes.js +++ b/src/public/javascripts/dialogs/recent_notes.js @@ -90,7 +90,7 @@ function showDialog() { }); } -reload(); +setTimeout(reload, 100); $(document).bind('keydown', 'ctrl+e', e => { showDialog(); diff --git a/src/public/javascripts/services/server.js b/src/public/javascripts/services/server.js index eed75110b..9463edd7c 100644 --- a/src/public/javascripts/services/server.js +++ b/src/public/javascripts/services/server.js @@ -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) { const options = { 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 { get, post,