mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-04-24 21:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

#98, better error reporting for sync setup

Browse Source
This commit is contained in:
azivner
2018-07-25 22:54:37 +02:00
parent d39cdbfada
commit 02dc7b199b
7 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/public/javascripts/dialogs/options.js
+7 -2
View File
@@ -223,9 +223,14 @@ addTabHandler((function() {
});
$syncToServerButton.click(async () => {
await server.post("setup/sync-to-server");
const resp = await server.post("setup/sync-to-server");
infoService.showMessage("Sync has been established to the server instance. It will take some time to finish.");
if (resp.success) {
infoService.showMessage("Sync has been established to the server instance. It will take some time to finish.");
}
else {
infoService.showError('Sync setup failed: ' + resp.error);
}
});
return {
src/public/javascripts/setup.js
+7 -1
View File
@@ -105,9 +105,11 @@ function SetupModel() {
this.step('sync-in-progress');
setInterval(checkOutstandingSyncs, 1000);
hideAlert();
}
else {
showAlert('Sync setup failed: ', resp.error);
showAlert('Sync setup failed: ' + resp.error);
}
}
};
@@ -130,6 +132,10 @@ function showAlert(message) {
$("#alert").show();
}
function hideAlert() {
$("#alert").hide();
}
ko.applyBindings(new SetupModel(), document.getElementById('setup-dialog'));
$("#setup-dialog").show();