self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-03-29 21:21:15 +02:00
Code Issues Releases Activity

Electron: Fixed: Confirmation message boxes, and release notes text

Browse Source
This commit is contained in:
Laurent Cozic 2018-02-16 18:06:02 +00:00
parent a796ef5c66
commit 7244e12b78
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ElectronClient/app/bridge.js
View File

@ -62,9 +62,9 @@ class Bridge {
return filePaths;
}
showMessageBox(options) {
showMessageBox(window, options) {
const {dialog} = require('electron');
return dialog.showMessageBox(this.window(), options);
return dialog.showMessageBox(window, options);
}
showErrorMessageBox(message) {

2
ElectronClient/app/checkForUpdates.js
View File

@ -16,6 +16,8 @@ autoUpdater.autoDownload = false;
function htmlToText_(html) {
let output = html.replace(/\n/g, '');
output = output.replace(/<li>/g, '- ');
output = output.replace(/<p>/g, '');
output = output.replace(/<\/p>/g, '\n');
output = output.replace(/<\/li>/g, '\n');
output = output.replace(/<ul>/g, '');
output = output.replace(/<\/ul>/g, '');