mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-01-22 05:05:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

electron fixes

Browse Source
This commit is contained in:
azivner
2018-04-05 23:17:19 -04:00
parent 98f80998b9
commit e827ddffb9
7 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/public/javascripts/migration.js
View File

@@ -1,20 +1,19 @@
import server from './services/server.js';
$(document).ready(() => {
server.get('migration').then(result => {
const appDbVersion = result.app_dbVersion;
const dbVersion = result.dbVersion;
$(document).ready(async () => {
const {appDbVersion, dbVersion} = await server.get('migration');
if (appDbVersion === dbVersion) {
$("#up-to-date").show();
}
else {
$("#need-to-migrate").show();
console.log("HI", {appDbVersion, dbVersion});
$("#app-db-version").html(appDbVersion);
$("#db-version").html(dbVersion);
}
});
if (appDbVersion === dbVersion) {
$("#up-to-date").show();
}
else {
$("#need-to-migrate").show();
$("#app-db-version").html(appDbVersion);
$("#db-version").html(dbVersion);
}
});
$("#run-migration").click(async () => {
@@ -37,4 +36,11 @@ $("#run-migration").click(async () => {
$("#migration-table").append(row);
}
});
// copy of this shortcut to be able to debug migration problems
$(document).bind('keydown', 'ctrl+shift+i', () => {
require('electron').remote.getCurrentWindow().toggleDevTools();
return false;
});

2
src/public/javascripts/services/messaging.js
View File

@@ -100,7 +100,7 @@ setTimeout(() => {
lastSyncId: lastSyncId
}));
}, 1000);
}, 1000);
}, 0);
export default {
logError,

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

@@ -85,19 +85,17 @@ async function ajax(url, method, data) {
});
}
setTimeout(() => {
if (utils.isElectron()) {
const ipc = require('electron').ipcRenderer;
if (utils.isElectron()) {
const ipc = require('electron').ipcRenderer;
ipc.on('server-response', (event, arg) => {
console.log(utils.now(), "Response #" + arg.requestId + ": " + arg.statusCode);
ipc.on('server-response', (event, arg) => {
console.log(utils.now(), "Response #" + arg.requestId + ": " + arg.statusCode);
reqResolves[arg.requestId](arg.body);
reqResolves[arg.requestId](arg.body);
delete reqResolves[arg.requestId];
});
}
}, 100);
delete reqResolves[arg.requestId];
});
}
export default {
get,