mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-01-16 09:50:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

relaunch app after successful sync

Browse Source
This commit is contained in:
zadam
2019-12-28 12:55:53 +01:00
parent 05a8ffb944
commit bb8b563ece
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/javascripts/services/frontend_script_api.js
View File

@@ -125,14 +125,14 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
}
/**
* Executes given anonymous function on the server.
* Executes given anonymous function on the backend.
* Internally this serializes the anonymous function into string and sends it to backend via AJAX.
*
* @param {string} script - script to be executed on the backend
* @param {Array.<?>} params - list of parameters to the anonymous function to be send to backend
* @return {Promise<*>} return value of the executed function on the backend
*/
this.runOnServer = async (script, params = []) => {
this.runOnBackend = async (script, params = []) => {
if (typeof script === "function") {
script = script.toString();
}
@@ -159,6 +159,12 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
}
};
/**
* @deprecated new name of this API call is runOnBackend so use that
* @method
*/
this.runOnServer = this.runOnBackend;
/**
* This is a powerful search method - you can search by attributes and their values, e.g.:
* "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search

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

@@ -131,12 +131,15 @@ async function checkOutstandingSyncs() {
const { stats, initialized } = await $.get('api/sync/stats');
if (initialized) {
window.location.replace("./");
const remote = require('electron').remote;
remote.app.relaunch();
remote.app.exit(0);
}
else {
const totalOutstandingSyncs = stats.outstandingPushes + stats.outstandingPulls;
const totalOutstandingSyncs = stats.outstandingPushes + stats.outstandingPulls;
$("#outstanding-syncs").html(totalOutstandingSyncs);
$("#outstanding-syncs").html(totalOutstandingSyncs);
}
}
function showAlert(message) {