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

Desktop: Upgrade to Electron 7

Browse Source
This commit is contained in:
Laurent Cozic 2019-12-17 11:08:55 +00:00
parent ee38590c35
commit cad6b7971f
5 changed files with 1217 additions and 1179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ElectronClient/app/InteropServiceHelper.js
View File

@ -43,14 +43,17 @@ class InteropServiceHelper {
win = bridge().newBrowserWindow(windowOptions); win = bridge().newBrowserWindow(windowOptions);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
win.webContents.on('did-finish-load', () => { win.webContents.on('did-finish-load', async () => {
if (target === 'pdf') { if (target === 'pdf') {
win.webContents.printToPDF(options, (error, data) => { try {
cleanup(); const data = await win.webContents.printToPDF(options);
if (error) reject(error);
resolve(data); resolve(data);
}); } catch (error) {
reject(error);
} finally {
cleanup();
}
} else { } else {
win.webContents.print(options, (success) => { win.webContents.print(options, (success) => {
// TODO: This is correct but broken in Electron 4. Need to upgrade to 5+ // TODO: This is correct but broken in Electron 4. Need to upgrade to 5+

6
ElectronClient/app/bridge.js
View File

@ -47,7 +47,7 @@ class Bridge {
const {dialog} = require('electron'); const {dialog} = require('electron');
if (!options) options = {}; if (!options) options = {};
if (!('defaultPath' in options) && this.lastSelectedPath_) options.defaultPath = this.lastSelectedPath_; if (!('defaultPath' in options) && this.lastSelectedPath_) options.defaultPath = this.lastSelectedPath_;
const filePath = dialog.showSaveDialog(this.window(), options); const filePath = dialog.showSaveDialogSync(this.window(), options);
if (filePath) { if (filePath) {
this.lastSelectedPath_ = filePath; this.lastSelectedPath_ = filePath;
} }
@ -59,7 +59,7 @@ class Bridge {
if (!options) options = {}; if (!options) options = {};
if (!('defaultPath' in options) && this.lastSelectedPath_) options.defaultPath = this.lastSelectedPath_; if (!('defaultPath' in options) && this.lastSelectedPath_) options.defaultPath = this.lastSelectedPath_;
if (!('createDirectory' in options)) options.createDirectory = true; if (!('createDirectory' in options)) options.createDirectory = true;
const filePaths = dialog.showOpenDialog(this.window(), options); const filePaths = dialog.showOpenDialogSync(this.window(), options);
if (filePaths && filePaths.length) { if (filePaths && filePaths.length) {
this.lastSelectedPath_ = dirname(filePaths[0]); this.lastSelectedPath_ = dirname(filePaths[0]);
} }
@ -70,7 +70,7 @@ class Bridge {
showMessageBox_(window, options) { showMessageBox_(window, options) {
const {dialog} = require('electron'); const {dialog} = require('electron');
if (!window) window = this.window(); if (!window) window = this.window();
return dialog.showMessageBox(window, options); return dialog.showMessageBoxSync(window, options);
} }
showErrorMessageBox(message) { showErrorMessageBox(message) {

2
ElectronClient/app/gui/NoteText.jsx
View File

@ -1266,7 +1266,7 @@ class NoteTextComponent extends React.Component {
pageSize: Setting.value('export.pdfPageSize'), pageSize: Setting.value('export.pdfPageSize'),
landscape: Setting.value('export.pdfPageOrientation') === 'landscape', landscape: Setting.value('export.pdfPageOrientation') === 'landscape',
}); });
shim.fsDriver().writeFile(options.path, pdfData, 'buffer'); await shim.fsDriver().writeFile(options.path, pdfData, 'buffer');
} catch (error) { } catch (error) {
console.error(error); console.error(error);
bridge().showErrorMessageBox(error.message); bridge().showErrorMessageBox(error.message);

2361
ElectronClient/app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
ElectronClient/app/package.json
View File

@ -74,9 +74,9 @@
"app-builder-bin": "^1.9.11", "app-builder-bin": "^1.9.11",
"babel-cli": "^6.26.0", "babel-cli": "^6.26.0",
"babel-preset-react": "^6.24.1", "babel-preset-react": "^6.24.1",
"electron": "^4.1.4", "electron": "^7.1.5",
"electron-builder": "20.38.5", "electron-builder": "^21.2.0",
"electron-rebuild": "^1.8.5" "electron-rebuild": "^1.8.8"
}, },
"optionalDependencies": { "optionalDependencies": {
"7zip-bin-linux": "^1.0.1", "7zip-bin-linux": "^1.0.1",
@ -149,7 +149,7 @@
"server-destroy": "^1.0.1", "server-destroy": "^1.0.1",
"smalltalk": "^2.5.1", "smalltalk": "^2.5.1",
"sprintf-js": "^1.1.1", "sprintf-js": "^1.1.1",
"sqlite3": "^4.0.6", "sqlite3": "^4.1.1",
"string-padding": "^1.0.2", "string-padding": "^1.0.2",
"string-to-stream": "^1.1.1", "string-to-stream": "^1.1.1",
"syswide-cas": "^5.1.0", "syswide-cas": "^5.1.0",